- request_dtor() should be called if a fatal error occurs during activation

  phase.

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index f753cfcc9d58f3481aac9249326da2c04b64f803..f5b133bcc1bf475b603bb6f248762ea097a02c4d 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -547,6 +547,8 @@ zend_first_try {
 #endif
        }
 
+} zend_end_try();
+
        if (!parent_req) {
                php_apache_request_dtor(r TSRMLS_CC);
                ctx->request_processed = 1;
@@ -562,8 +564,6 @@ zend_first_try {
                ctx->r = parent_req;
        }
 
-} zend_end_try();
-
        return OK;
 }