cvs: ZendEngine2 / zend_execute_API.c

helly		Mon Aug 11 17:33:02 2008 UTC

  Modified files:              
    /ZendEngine2	zend_execute_API.c 
  Log:
  - Fix shutdown order
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.458&r2=1.459&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.458 ZendEngine2/zend_execute_API.c:1.459
--- ZendEngine2/zend_execute_API.c:1.458	Fri Aug  8 17:10:49 2008
+++ ZendEngine2/zend_execute_API.c	Mon Aug 11 17:33:02 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.458 2008/08/08 17:10:49 helly Exp $ */
+/* $Id: zend_execute_API.c,v 1.459 2008/08/11 17:33:02 helly Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -311,6 +311,8 @@
 
 		zend_vm_stack_destroy(TSRMLS_C);
 
+		zend_objects_store_free_object_storage(&EG(objects_store) TSRMLS_CC);
+
 		/* Destroy all op arrays */
 		if (EG(full_tables_cleanup)) {
 			zend_hash_apply(EG(function_table), (apply_func_t) clean_non_persistent_function_full TSRMLS_CC);
@@ -325,7 +327,6 @@
 			FREE_HASHTABLE(*EG(symtable_cache_ptr));
 			EG(symtable_cache_ptr)--;
 		}
-		zend_objects_store_free_object_storage(&EG(objects_store) TSRMLS_CC);
 	} zend_end_try();
 
 	zend_try {



-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php