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

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c
This commit is contained in:
Dmitry Stogov 2019-03-12 17:36:02 +03:00
commit dbb462db5d
12 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/apache2handler/sapi_apache2.c
View file

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