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 /main/SAPI.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 'main/SAPI.c')
| -rw-r--r-- | main/SAPI.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 0d81731f5c..6a272d4c64 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -56,9 +56,6 @@ static void _type_dtor(zval *zv) static void sapi_globals_ctor(sapi_globals_struct *sapi_globals) { -#ifdef ZTS - ZEND_TSRMLS_CACHE_UPDATE(); -#endif memset(sapi_globals, 0, sizeof(*sapi_globals)); zend_hash_init_ex(&sapi_globals->known_post_content_types, 8, NULL, _type_dtor, 1, 0); php_setup_sapi_content_types(); |