cvs: ZendEngine2 / zend.c

sebastian Thu Apr 17 10:33:38 2003 EDT Modified files: /ZendEngine2 zend.c Log: Patch by Marcus Börger <helly@php.net>. Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.222 ZendEngine2/zend.c:1.223 --- ZendEngine2/zend.c:1.222 Thu Apr 3 09:44:41 2003 +++ ZendEngine2/zend.c Thu Apr 17 10:33:38 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.222 2003/04/03 14:44:41 andrei Exp $ */ +/* $Id: zend.c,v 1.223 2003/04/17 14:33:38 sebastian Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -444,12 +444,12 @@ EG(user_exception_handler) = NULL; EG(in_execution) = 0; EG(current_execute_data) = NULL; + EG(active_namespace) = NULL; } static void executor_globals_dtor(zend_executor_globals *executor_globals TSRMLS_DC) { - zend_shutdown_constants(TSRMLS_C); zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); zend_ini_shutdown(TSRMLS_C); } @@ -654,8 +654,8 @@ #ifndef ZTS zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); #endif - zend_destroy_rsrc_list_dtors(); zend_hash_graceful_reverse_destroy(&module_registry); + zend_destroy_rsrc_list_dtors(); #ifndef ZTS /* In ZTS mode these are freed by compiler_globals_dtor() */ @@ -667,9 +667,7 @@ free(GLOBAL_AUTO_GLOBALS_TABLE); zend_shutdown_extensions(TSRMLS_C); free(zend_version_info); -#ifndef ZTS - zend_shutdown_constants(); -#endif + zend_shutdown_constants(TSRMLS_C); }