cvs: ZendEngine2 / zend.c
| From: | Marcus Boerger | Date: | Sat, 31 May 2003 19:21:52 +0000 |
| Subject: | cvs: ZendEngine2 / zend.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-1291@lists.php.net to get a copy of this message | ||
helly Sat May 31 15:21:52 2003 EDT
Modified files:
/ZendEngine2 zend.c
Log:
Fix init shutdown
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.228 ZendEngine2/zend.c:1.229
--- ZendEngine2/zend.c:1.228 Tue May 27 14:52:25 2003
+++ ZendEngine2/zend.c Sat May 31 15:21:52 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.228 2003/05/27 18:52:25 sterling Exp $ */
+/* $Id: zend.c,v 1.229 2003/05/31 19:21:52 helly Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -461,7 +461,6 @@
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 @@
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);