From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 26 Jan 2018 12:25:03 +0000 (+0300)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53eb20f0cbfbe396b5a122aeeb990b41cfb34db6;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Restore initial values on graceful server restart.
---

53eb20f0cbfbe396b5a122aeeb990b41cfb34db6
diff --cc Zend/zend_string.c
index 28d9b8a9a0,e4edc92e47..873fb6e496
--- a/Zend/zend_string.c
+++ b/Zend/zend_string.c
@@@ -78,6 -69,12 +78,14 @@@ ZEND_API void zend_interned_strings_ini
  	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;