[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c

[Moriyoshi Koizumi]

moriyoshi               Sat Jul 17 17:31:44 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  - MFH (sapi_apache2.c: 1.41): request_dtor should be called if a fatal error
    occurs during activation phase.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40&r2=1.40.2.1&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40 
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.1
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40     Fri Jun 25 09:00:48 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Sat Jul 17 17:31:43 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.40 2004/06/25 13:00:48 edink Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.1 2004/07/17 21:31:43 moriyoshi Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -547,6 +547,8 @@
 #endif
        }
 
+} zend_end_try();
+
        if (!parent_req) {
                php_apache_request_dtor(r TSRMLS_CC);
                ctx->request_processed = 1;
@@ -561,8 +563,6 @@
        } else {
                ctx->r = parent_req;
        }
-
-} zend_end_try();
 
        return OK;
 }

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