From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 7 Nov 2005 12:24:20 +0000 (+0000)
Subject: Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compile... 
X-Git-Tag: RELEASE_2_0_1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32fe5f2c3b1cffaffe4fd0c411f27160b3c10b31;p=php

Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compiled as shared)
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 99c4bfde2d..7d7abff75e 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1341,6 +1341,9 @@ void zend_shutdown(TSRMLS_D)
 #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 @@ void zend_shutdown(TSRMLS_D)
 	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;