cvs: ZendEngine2(PHP_5_0) / zend.c php-src NEWS
| From: | Dmitry Stogov | Date: | Mon, 07 Nov 2005 12:25:22 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_0) / zend.c php-src NEWS | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4327@lists.php.net to get a copy of this message | ||
dmitry Mon Nov 7 07:25:22 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.1760.2.509&r2=1.1760.2.510&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.509 php-src/NEWS:1.1760.2.510
--- php-src/NEWS:1.1760.2.509 Wed Nov 2 04:15:04 2005
+++ php-src/NEWS Mon Nov 7 07:25:19 2005
@@ -4,6 +4,8 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number > field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension
+ is compiled as shared). (Dmitry)
- Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is
zero). (Tony)
- Fixed bug #34982 (array_walk_recursive() modifies elements outside function
http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.287.2.13&r2=1.287.2.14&ty=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.287.2.13 ZendEngine2/zend.c:1.287.2.14
--- ZendEngine2/zend.c:1.287.2.13 Tue Sep 20 07:38:37 2005
+++ ZendEngine2/zend.c Mon Nov 7 07:25:21 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.287.2.13 2005/09/20 11:38:37 tony2001 Exp $ */
+/* $Id: zend.c,v 1.287.2.14 2005/11/07 12:25:21 dmitry Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -693,9 +693,7 @@
#ifdef ZEND_WIN32
zend_shutdown_timeout_thread();
#endif
-#ifndef ZTS
zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
-#endif
zend_hash_graceful_reverse_destroy(&module_registry);
zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
@@ -711,7 +709,6 @@
free(GLOBAL_FUNCTION_TABLE);
free(GLOBAL_CLASS_TABLE);
#ifdef ZTS
- zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
zend_hash_destroy(GLOBAL_CONSTANTS_TABLE);
free(GLOBAL_CONSTANTS_TABLE);
GLOBAL_FUNCTION_TABLE = NULL;