diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-14 03:02:10 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-14 03:02:10 +0300 |
| commit | 2dd2dcaf9c8bcdda9c687660da887c5fddeb7448 (patch) | |
| tree | 0815453b216df50724b504f01825f3c4ca368f3e /sapi/apache2handler | |
| parent | d349ea3ceb30b99657c0843f6ffc4ed7af619dd5 (diff) | |
| parent | 9499484ed2f0377678b2b4d88573327ee0e4ce6d (diff) | |
| download | php-git-2dd2dcaf9c8bcdda9c687660da887c5fddeb7448.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index f3325dae89..7b9107e7fc 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -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 |