diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 17:36:02 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 17:36:02 +0300 |
| commit | dbb462db5d55d77dcc63237e4e33e315bd2cbd4d (patch) | |
| tree | babfe7d537e8eea0cecac5eaa6f31ca332ea3ebc /sapi/cgi/cgi_main.c | |
| parent | 59e954524efc57a5e45565d255d45577e0e32215 (diff) | |
| parent | 04b67bac32e5fbc0942a1e15405fa1ca7f0438fe (diff) | |
| download | php-git-dbb462db5d55d77dcc63237e4e33e315bd2cbd4d.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index bc157ec70e..84d2213cd6 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1532,7 +1532,7 @@ PHP_INI_END() */ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals) { -#ifdef ZTS +#if defined(ZTS) && defined(PHP_WIN32) ZEND_TSRMLS_CACHE_UPDATE(); #endif php_cgi_globals->rfc2616_headers = 0; @@ -1793,7 +1793,9 @@ int main(int argc, char *argv[]) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); (void)ts_resource(0); +# ifdef PHP_WIN32 ZEND_TSRMLS_CACHE_UPDATE(); +# endif #endif zend_signal_startup(); |