]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorDmitry Stogov <dmitry@zend.com>
Fri, 26 Jan 2018 12:25:03 +0000 (15:25 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 26 Jan 2018 12:25:03 +0000 (15:25 +0300)
* PHP-7.2:
  Restore initial values on graceful server restart.

1  2 
Zend/zend_string.c

index 28d9b8a9a0f98352d23644c747fc3565e4ea4599,e4edc92e477474f29831f3674bae9fa2e83ef046..873fb6e496ddc5d74729741354b83c02cae25802
@@@ -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;