move namespace destruction to end of process

Author: withinboredom

Zend/zend.c

@@ -18,6 +18,9 @@
 */
 
 #include "zend.h"
+
+#include <zend_namespaces.h>
+
 #include "zend_extensions.h"
 #include "zend_modules.h"
 #include "zend_constants.h"
@@ -1223,6 +1226,8 @@ void zend_shutdown(void) /* {{{ */
 	zend_map_ptr_static_last = 0;
 	zend_map_ptr_static_size = 0;
 
+	zend_destroy_namespaces();
+
 	zend_destroy_rsrc_list_dtors();
 
 	zend_unload_modules();

main/main.c

@@ -66,8 +66,6 @@
 #include <sys/wait.h>
 #endif
 
-#include <zend_namespaces.h>
-
 #include "zend_compile.h"
 #include "zend_execute.h"
 #include "zend_highlight.h"
@@ -1968,8 +1966,6 @@ void php_request_shutdown(void *dummy)
 		zend_post_deactivate_modules();
 	} zend_end_try();
 
-	zend_destroy_namespaces();
-
 	/* 12. SAPI related shutdown*/
 	zend_try {
 		sapi_deactivate_module();