finally fix the elusive memory leak

Author: withinboredom

Zend/zend.c

@@ -19,8 +19,6 @@
 
 #include "zend.h"
 
-#include <zend_namespaces.h>
-
 #include "zend_extensions.h"
 #include "zend_modules.h"
 #include "zend_constants.h"
@@ -1232,7 +1230,6 @@ void zend_shutdown(void) /* {{{ */
 
 	zend_optimizer_shutdown();
 
-	zend_destroy_namespaces();
 	startup_done = false;
 }
 /* }}} */

Zend/zend_namespaces.c

@@ -49,7 +49,7 @@ static zend_class_entry *insert_namespace(const zend_string *name) {
 	while (pos <= end) {
 		if (pos == end || *pos == '\\') {
 			len = pos - start;
-			zend_string *needle = zend_string_init(ZSTR_VAL(name), len, 1);
+			zend_string *needle = zend_string_init(ZSTR_VAL(name), len, 0);
 
 			ns = zend_hash_find_ptr(&namespaces, needle);
 

main/main.c

@@ -66,6 +66,8 @@
 #include <sys/wait.h>
 #endif
 
+#include "zend_namespaces.h"
+
 #include "zend_compile.h"
 #include "zend_execute.h"
 #include "zend_highlight.h"
@@ -1956,6 +1958,7 @@ void php_request_shutdown(void *dummy)
 	} zend_end_try();
 
 	/* 9. Shutdown scanner/executor/compiler and restore ini entries */
+	zend_destroy_namespaces();
 	zend_deactivate();
 
 	/* 10. free request-bound globals */