cvs: ZendEngine2(PHP_5_1) / zend.c php-src NEWS

dmitry Mon Nov 7 07:24:56 2005 EDT Modified files: (Branch: PHP_5_1) /php-src NEWS /ZendEngine2 zend.c Log: Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compiled as shared) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.178&r2=1.2027.2.179&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.178 php-src/NEWS:1.2027.2.179 --- php-src/NEWS:1.2027.2.178 Mon Nov 7 05:05:25 2005 +++ php-src/NEWS Mon Nov 7 07:24:44 2005 @@ -9,6 +9,8 @@ - Fixed bug #35017 (Exception thrown in error handler may cause unexpected behavior). (Dmitry) - Fixed bug #35014 (array_product() always returns 0). (Ilia) +- Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension + is compiled as shared). (Dmitry) - Fixed bug #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer parameter on Windows). (Mike) - Fixed bug #31971 (ftp_login fails on some SSL servers). http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.308.2.2&r2=1.308.2.3&ty=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.308.2.2 ZendEngine2/zend.c:1.308.2.3 --- ZendEngine2/zend.c:1.308.2.2 Fri Sep 16 13:05:06 2005 +++ ZendEngine2/zend.c Mon Nov 7 07:24:55 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.308.2.2 2005/09/16 17:05:06 tony2001 Exp $ */ +/* $Id: zend.c,v 1.308.2.3 2005/11/07 12:24:55 dmitry Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -702,6 +702,7 @@ #ifdef ZEND_WIN32 zend_shutdown_timeout_thread(); #endif + zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); zend_hash_graceful_reverse_destroy(&module_registry); zend_hash_destroy(GLOBAL_FUNCTION_TABLE); @@ -719,7 +720,6 @@ zend_hash_destroy(GLOBAL_CONSTANTS_TABLE); free(GLOBAL_CONSTANTS_TABLE); - zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); #ifdef ZTS GLOBAL_FUNCTION_TABLE = NULL; GLOBAL_CLASS_TABLE = NULL;