Merge branch 'PHP-7.4'

* 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

View file

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