cvs: ZendEngine2 / zend.c

dmitry Mon Nov 7 07:24:24 2005 EDT Modified files: /ZendEngine2 zend.c Log: Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compiled as shared) http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.326&r2=1.327&ty=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.326 ZendEngine2/zend.c:1.327 --- ZendEngine2/zend.c:1.326 Wed Oct 12 06:12:15 2005 +++ ZendEngine2/zend.c Mon Nov 7 07:24:20 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.326 2005/10/12 10:12:15 dmitry Exp $ */ +/* $Id: zend.c,v 1.327 2005/11/07 12:24:20 dmitry Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -1341,6 +1341,9 @@ #ifdef ZEND_WIN32 zend_shutdown_timeout_thread(); #endif + if (global_persistent_list) { + zend_destroy_rsrc_list(global_persistent_list TSRMLS_CC); + } zend_hash_graceful_reverse_destroy(&module_registry); zend_hash_destroy(global_function_table); @@ -1377,9 +1380,6 @@ if (global_u_class_table) { free(global_u_class_table); } - if (global_persistent_list) { - zend_destroy_rsrc_list(global_persistent_list TSRMLS_CC); - } #ifdef ZTS global_function_table = NULL; global_u_function_table = NULL;