From 6957c8ab5a0eff7026ba5be568b8c6d900ed6d1f Mon Sep 17 00:00:00 2001 From: Moriyoshi Koizumi Date: Tue, 20 Jul 2004 20:48:01 +0000 Subject: [PATCH] - 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... --- sapi/apache2handler/sapi_apache2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 445daeae13..0bf67b6555 100644 --- 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; } -- 2.50.1