cvs: ZendEngine2(PHP_5_3) / zend_execute_API.c

"Marcus Boerger" <[email protected]>
Newsgroups gmane.comp.php.cvs.zend
Message-ID <cvshelly1218476655@cvsserver>
helly		Mon Aug 11 17:44:15 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_execute_API.c 
  Log:
  - MFH Fix shutdown order
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.52&r2=1.331.2.20.2.24.2.53&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.52 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.53
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.52	Fri Aug  8 17:47:29 2008
+++ ZendEngine2/zend_execute_API.c	Mon Aug 11 17:44:15 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.52 2008/08/08 17:47:29 helly Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.53 2008/08/11 17:44:15 helly Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -290,6 +290,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);
@@ -304,7 +306,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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.