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 94f39435b94c0e99829f734f1a3db73ece983122..767a72870bedb9ca28898a23e02466f1ada5a4a2 100644 (file)
--- 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,