derick Wed Sep 14 16:08:35 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main main.c
Log:
- Fixed shutdown order before RC2.
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.4&r2=1.640.2.5&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.4 php-src/main/main.c:1.640.2.5
--- php-src/main/main.c:1.640.2.4 Fri Sep 2 10:05:45 2005
+++ php-src/main/main.c Wed Sep 14 16:08:31 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.4 2005/09/02 14:05:45 sniper Exp $ */
+/* $Id: main.c,v 1.640.2.5 2005/09/14 20:08:31 derick Exp $ */
/* {{{ includes
*/
@@ -1200,16 +1200,16 @@
EG(opline_ptr) = NULL;
EG(active_op_array) = NULL;
- /* 1. Call all possible __destruct() functions */
- zend_try {
- zend_call_destructors(TSRMLS_C);
- } zend_end_try();
-
- /* 2. Call all possible shutdown functions registered with
register_shutdown_function() */
+ /* 1. Call all possible shutdown functions registered with
register_shutdown_function() */
if (PG(modules_activated)) zend_try {
php_call_shutdown_functions(TSRMLS_C);
} zend_end_try();
+ /* 2. Call all possible __destruct() functions */
+ zend_try {
+ zend_call_destructors(TSRMLS_C);
+ } zend_end_try();
+
/* 3. Flush all output buffers */
zend_try {
php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1) TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
