From: Marcus Boerger <helly@php.net>
Date: Sat, 31 May 2003 19:21:52 +0000 (+0000)
Subject: Fix init shutdown
X-Git-Tag: RELEASE_1_0_2~478
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e4286112e4042b441623a14e49c3aa0ad269558;p=php

Fix init shutdown
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 2fdd7d00ad..8dbe71f39c 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -461,7 +461,6 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals TSRMLS
 
 static void executor_globals_dtor(zend_executor_globals *executor_globals TSRMLS_DC)
 {
-	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
 	zend_ini_shutdown(TSRMLS_C);
 }
 
@@ -600,6 +599,9 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 
 	zend_hash_destroy(executor_globals->zend_constants);
 	*executor_globals->zend_constants = *GLOBAL_CONSTANTS_TABLE;
+
+	CG(global_namespace).name = NULL;
+	CG(global_namespace).name_length = 0;
 #else
 	zend_hash_init_ex(CG(auto_globals), 8, NULL, (dtor_func_t) zend_auto_global_dtor, 1, 0);
 	scanner_globals_ctor(&ini_scanner_globals TSRMLS_CC);