From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sat, 17 Jul 2004 21:29:50 +0000 (+0000)
Subject: - request_dtor() should be called if a fatal error occurs during activation
X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~482
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2af6d0e1ab006a7332c76e5c948cda550628e9cb;p=php

- 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 f753cfcc9d..f5b133bcc1 100644
--- 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;
 }