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 /Zend/zend.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 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 1ad1e8cfc6..e49392b00b 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -679,8 +679,6 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals) /* {{ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{{ */ { - ZEND_TSRMLS_CACHE_UPDATE(); - zend_startup_constants(); zend_copy_constants(executor_globals->zend_constants, GLOBAL_CONSTANTS_TABLE); zend_init_rsrc_plist(); @@ -780,7 +778,6 @@ int zend_startup(zend_utility_functions *utility_functions) /* {{{ */ zend_executor_globals *executor_globals; extern ZEND_API ts_rsrc_id ini_scanner_globals_id; extern ZEND_API ts_rsrc_id language_scanner_globals_id; - ZEND_TSRMLS_CACHE_UPDATE(); #else extern zend_ini_scanner_globals ini_scanner_globals; extern zend_php_scanner_globals language_scanner_globals; |