diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 17:35:50 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 17:35:50 +0300 |
| commit | 04b67bac32e5fbc0942a1e15405fa1ca7f0438fe (patch) | |
| tree | 2c302e1a5f3389a813955f2cecd75e1b635e485a /sapi/apache2handler | |
| parent | 7139c381f133eff38e1fcebfa29f35119c8648f4 (diff) | |
| download | php-git-04b67bac32e5fbc0942a1e15405fa1ca7f0438fe.tar.gz | |
Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 1aeccb17c9..81198af562 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -476,7 +476,9 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp #ifdef ZTS tsrm_startup(1, 1, 0, NULL); (void)ts_resource(0); +# ifdef PHP_WIN32 ZEND_TSRMLS_CACHE_UPDATE(); +# endif #endif zend_signal_startup(); @@ -574,7 +576,9 @@ static int php_handler(request_rec *r) #ifdef ZTS /* initial resource fetch */ (void)ts_resource(0); +# ifdef PHP_WIN32 ZEND_TSRMLS_CACHE_UPDATE(); +# endif #endif #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req); |