summaryrefslogtreecommitdiff
path: root/Zend/zend.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-06-02 17:55:48 +0200
committerAnatol Belski <ab@php.net>2016-06-02 17:55:48 +0200
commit47e26cf9dbe9c9650f2d33280845b8794db03910 (patch)
tree010dbbc70e65acc51ae8bf9f07c7a963e361ae78 /Zend/zend.c
parentf3998d2303d571d815eb0e4b3cc04917369396c8 (diff)
downloadphp-git-47e26cf9dbe9c9650f2d33280845b8794db03910.tar.gz
fix known interned strings init with TS per request
Diffstat (limited to 'Zend/zend.c')
-rw-r--r--Zend/zend.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index c4b91ce31a..f2fa4b12d9 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -504,6 +504,8 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{
compiler_globals->empty_string = zend_zts_interned_string_init("", sizeof("")-1);
memset(compiler_globals->one_char_string, 0, sizeof(compiler_globals->one_char_string));
+
+ zend_known_interned_strings_init(&compiler_globals->known_strings, &compiler_globals->known_strings_count);
}
/* }}} */
@@ -530,6 +532,9 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals) /* {{
compiler_globals->last_static_member = 0;
zend_zts_interned_string_free(&compiler_globals->empty_string);
+
+ compiler_globals->known_strings = NULL;
+ compiler_globals->known_strings_count = 0;
}
/* }}} */