]> granicus.if.org Git - php/commitdiff
Fix init shutdown
authorMarcus Boerger <helly@php.net>
Sat, 31 May 2003 19:21:52 +0000 (19:21 +0000)
committerMarcus Boerger <helly@php.net>
Sat, 31 May 2003 19:21:52 +0000 (19:21 +0000)
Zend/zend.c

index 2fdd7d00ad0989b51f2ab303e4b9e7dc98663af5..8dbe71f39ca54a459b245bccd9b085a25b64e4eb 100644 (file)
@@ -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);