diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-11-09 19:10:13 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-11-09 19:10:13 +0000 |
| commit | b3006ed2a549ff1f186e98294e29fe2b0eb64561 (patch) | |
| tree | f59d21b4a03a0f6d4131fc81e59ca96a0370f9c9 | |
| parent | fb06fa19e35e7725935d128205a989c87f05cc0d (diff) | |
| download | php-git-b3006ed2a549ff1f186e98294e29fe2b0eb64561.tar.gz | |
Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
ErrorDocument).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -49,6 +49,8 @@ PHP NEWS (Ilia) - Fixed bug #38536 (SOAP returns an array of values instead of an object). (Dmitry) +- Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php + ErrorDocument). (Ilia) - Fixed bug #33282 (Re-assignment by reference does not clear the is_ref flag) (Ilia,Dmitry, Matt Wilmas) diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 4cb12cb86f..b5818f8385 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -574,7 +574,7 @@ zend_first_try { } /* check if comming due to ErrorDocument */ - if (parent_req && parent_req->status != HTTP_OK) { + if (parent_req && parent_req->status != HTTP_OK && strcmp(r->protocol, "INCLUDED")) { parent_req = NULL; goto normal; } |