From cce0514c0c67add43bbbb721258280e73300db2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 8 Nov 2005 18:33:40 +0000 Subject: [PATCH] - fix from bug #35009: ZTS: Persistent resource destruct crashes when extension is compiled as shared Changed files: php-bug-35009.patch -> 1.1 --- php-bug-35009.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 php-bug-35009.patch diff --git a/php-bug-35009.patch b/php-bug-35009.patch new file mode 100644 index 0000000..ef08ed8 --- /dev/null +++ b/php-bug-35009.patch @@ -0,0 +1,35 @@ + +=================================================================== +RCS file: /repository/ZendEngine2/zend.c,v +retrieving revision 1.287.2.12 +retrieving revision 1.287.2.14 +diff -p --unified=3 -r1.287.2.12 -r1.287.2.14 +--- ./Zend/zend.c 2005/07/22 07:33:27 1.287.2.12 ++++ ./Zend/zend.c 2005/11/07 12:25:21 1.287.2.14 +@@ -17,7 +17,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id$ */ ++/* $Id$ */ + + #include "zend.h" + #include "zend_extensions.h" +@@ -693,9 +693,7 @@ void zend_shutdown(TSRMLS_D) + #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 @@ void zend_shutdown(TSRMLS_D) + 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; -- 2.44.0