Merge branch 'PHP-7.4'

* PHP-7.4:
  Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.
This commit is contained in:
Dmitry Stogov 2019-03-14 03:02:10 +03:00
commit 2dd2dcaf9c
28 changed files with 246 additions and 67 deletions

View file

@ -474,8 +474,7 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp
apache2_sapi_module.php_ini_path_override = apache2_php_ini_path_override;
}
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
php_tsrm_startup();
# ifdef PHP_WIN32
ZEND_TSRMLS_CACHE_UPDATE();
# endif