Add additional stage to post-session cleanup.

We need separate cleanup stage because of the following problem:
Suppose we destroy class X, which destroys function table,
and in function table we have function foo() that has static $bar. Now if
object of class X was assigned to $bar, its destructor will be called and will
fail since X's function table is in mid-destruction.
So we want first of all to clean up all data and then move to tables
destruction.
Note that only run-time accessed data need to be cleaned up, pre-defined
data can not contain objects and thus are not probelmatic.
# Looks like we are having a lots of pain in the various parts of the body
# because of the destructors...

1 files changed, 11 insertions, 0 deletions

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index c842ccc07f..6da53cacd0 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -218,6 +218,17 @@ void shutdown_executor(TSRMLS_D)
 
 		zend_ptr_stack_destroy(&EG(argument_stack));
 
+		/* 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,
+		   and in function table we have function foo() that has static $bar. Now if
+		   object of class X is assigned to $bar, its destructor will be called and will
+		   fail since X's function table is in mid-destruction.
+		   So we want first of all to clean up all data and then move to tables destruction.
+		   Note that only run-time accessed data need to be cleaned up, pre-defined data can
+		   not contain objects and thus are not probelmatic */
+		zend_hash_apply(EG(function_table), (apply_func_t) zend_cleanup_function_data);
+		zend_hash_apply(EG(class_table), (apply_func_t) zend_cleanup_class_data);
 		/* Destroy all op arrays */
 		if (EG(full_tables_cleanup)) {
 			zend_hash_apply(EG(function_table), (apply_func_t) is_not_internal_function TSRMLS_CC);