Backport later interned strings destruction.

php · Dec 24, 2018 · 5888fbd · 5888fbd
1 parent 7e597f4
commit 5888fbd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -930,10 +930,6 @@ void zend_shutdown(void) /* {{{ */
 	GLOBAL_CONSTANTS_TABLE = NULL;
 #endif
 	zend_destroy_rsrc_list_dtors();
-
-#ifndef ZTS
-	zend_interned_strings_dtor();
-#endif
 }
 /* }}} */
 

diff --git a/main/main.c b/main/main.c
@@ -2474,6 +2474,10 @@ void php_module_shutdown(void)
 
 	php_output_shutdown();
 
+#ifndef ZTS
+	zend_interned_strings_dtor();
+#endif
+
 	module_initialized = 0;
 
 #ifndef ZTS