diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2003-04-17 14:33:38 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2003-04-17 14:33:38 +0000 |
| commit | 5be2fe410ef6f52c4fa9bd8b17489df738128734 (patch) | |
| tree | df9233a3ea7f3bb9e0b6e184df062741261fa166 | |
| parent | 71c1104613fe9c764c593686829a07dcad8b9437 (diff) | |
| download | php-git-5be2fe410ef6f52c4fa9bd8b17489df738128734.tar.gz | |
Patch by Marcus Börger <helly@php.net>.
| -rw-r--r-- | Zend/zend.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index fc305fff49..beb38d1a01 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -444,12 +444,12 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals TSRMLS 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 @@ void zend_shutdown(TSRMLS_D) #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 @@ void zend_shutdown(TSRMLS_D) 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); } |