- MFH (sapi_apache2.c: 1.41): request_dtor() should be called if a fatal

  error occurs during activation phase.
# 4.3.8 patches need to be committed to this branch, otherwise...

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 445daeae13cd3a14be49a03c51d937173f95dc19..0bf67b6555b4766d66b34fff59ec318cbedc2467 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -552,6 +552,8 @@ zend_first_try {
 #endif
        }
 
+} zend_end_try();
+
        if (!parent_req) {
                php_apache_request_dtor(r TSRMLS_CC);
                ctx->request_processed = 1;
@@ -567,8 +569,6 @@ zend_first_try {
                ctx->r = parent_req;
        }
 
-} zend_end_try();
-
        return OK;
 }