diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2004-07-20 20:48:01 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2004-07-20 20:48:01 +0000 |
| commit | 6957c8ab5a0eff7026ba5be568b8c6d900ed6d1f (patch) | |
| tree | e133086f0641250bdfa2894ce255ebe7e5de0757 | |
| parent | 1802b2c9ddf2799d678f5ac5503008f596cd9442 (diff) | |
| download | php-git-6957c8ab5a0eff7026ba5be568b8c6d900ed6d1f.tar.gz | |
- 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...
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 4 |
1 files 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; } |