summaryrefslogtreecommitdiff
path: root/sapi/embed/php_embed.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-03-12 17:35:50 +0300
committerDmitry Stogov <dmitry@zend.com>2019-03-12 17:35:50 +0300
commit04b67bac32e5fbc0942a1e15405fa1ca7f0438fe (patch)
tree2c302e1a5f3389a813955f2cecd75e1b635e485a /sapi/embed/php_embed.c
parent7139c381f133eff38e1fcebfa29f35119c8648f4 (diff)
downloadphp-git-04b67bac32e5fbc0942a1e15405fa1ca7f0438fe.tar.gz
Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c
Diffstat (limited to 'sapi/embed/php_embed.c')
-rw-r--r--sapi/embed/php_embed.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index 826e9bd05e..4221e6e0eb 100644
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -173,7 +173,9 @@ EMBED_SAPI_API int php_embed_init(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();