From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Tue, 20 Jul 2004 20:48:01 +0000 (+0000)
Subject: - MFH (sapi_apache2.c: 1.41): request_dtor() should be called if a fatal
X-Git-Tag: php-4.3.9RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6957c8ab5a0eff7026ba5be568b8c6d900ed6d1f;p=php

- 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 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;
 }