archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c

Browse source
This commit is contained in:
Dmitry Stogov 2019-03-12 17:35:50 +03:00
parent 7139c381f1
commit 04b67bac32
12 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/cgi/cgi_main.c
View file

@ -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();