From: Stanislav Malyshev <stas@php.net>
Date: Sun, 27 Jul 2003 13:47:58 +0000 (+0000)
Subject: make shutdown more granular so in case some dtor goes ape we still
X-Git-Tag: BEFORE_ARG_INFO~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bfd386bc344c456edfd7930c9b400bd386dfed0;p=php

make shutdown more granular so in case some dtor goes ape we still
can shut down cleanly
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 94f39435b9..767a72870b 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -209,7 +209,9 @@ void shutdown_executor(TSRMLS_D)
 		zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_deactivator TSRMLS_CC);
 
 		zend_hash_destroy(&EG(symbol_table));
-
+	} zend_end_try();
+	
+	zend_try {
 		/* Cleanup static data for functions and arrays.
 		   We need separate cleanup stage because of the following problem:
 		   Suppose we destroy class X, which destroys function table,