summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2004-07-17 21:29:50 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2004-07-17 21:29:50 +0000
commit2af6d0e1ab006a7332c76e5c948cda550628e9cb (patch)
treed77870a6c568d59a4e4152a3c4dba76dac3f9966 /sapi
parent15ef63b39abd747195b58f2f0cee524b6ffee371 (diff)
downloadphp-git-2af6d0e1ab006a7332c76e5c948cda550628e9cb.tar.gz
- request_dtor() should be called if a fatal error occurs during activation
phase.
Diffstat (limited to 'sapi')
-rw-r--r--sapi/apache2handler/sapi_apache2.c4
1 files changed, 2 insertions, 2 deletions
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;
}