[PHP-CVS] cvs: php-src(PHP_5_0) /main main.c

[Derick Rethans]

derick          Wed Sep 14 16:11:29 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/main       main.c 
  Log:
  - MF51: Fixed shutdown order.
  
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.22&r2=1.604.2.23&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604.2.22 php-src/main/main.c:1.604.2.23
--- php-src/main/main.c:1.604.2.22      Tue Aug 16 14:11:34 2005
+++ php-src/main/main.c Wed Sep 14 16:11:26 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.604.2.22 2005/08/16 18:11:34 helly Exp $ */
+/* $Id: main.c,v 1.604.2.23 2005/09/14 20:11:26 derick Exp $ */
 
 /* {{{ includes
  */
@@ -1194,13 +1194,13 @@
                sapi_send_headers(TSRMLS_C);
        } zend_end_try();
 
-       zend_try {
-               zend_call_destructors(TSRMLS_C);
-       } zend_end_try();
-
        if (PG(modules_activated)) zend_try {
                php_call_shutdown_functions(TSRMLS_C);
        } zend_end_try();
+
+       zend_try {
+               zend_call_destructors(TSRMLS_C);
+       } zend_end_try();
        
        if (PG(modules_activated)) {
                zend_deactivate_modules(TSRMLS_C);

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