diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-26 15:25:03 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-26 15:25:03 +0300 |
| commit | 53eb20f0cbfbe396b5a122aeeb990b41cfb34db6 (patch) | |
| tree | 45a40f350d965f5ec2f1bcd0eb890c6de7e059aa | |
| parent | 9edf2e9f9605392ba1f6fe05f2e19af4940a5037 (diff) | |
| parent | aad12cb49c300a578d212d3f3e0fa00f6688161c (diff) | |
| download | php-git-53eb20f0cbfbe396b5a122aeeb990b41cfb34db6.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Restore initial values on graceful server restart.
| -rw-r--r-- | Zend/zend_string.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 28d9b8a9a0..873fb6e496 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -78,6 +78,14 @@ ZEND_API void zend_interned_strings_init(void) int i; zend_string *str; + interned_string_request_handler = zend_new_interned_string_request; + interned_string_init_request_handler = zend_string_init_interned_request; + interned_string_copy_storage = NULL; + interned_string_restore_storage = NULL; + + zend_empty_string = NULL; + zend_known_strings = NULL; + zend_init_interned_strings_ht(&interned_strings_permanent, 1); zend_new_interned_string = zend_new_interned_string_permanent; |