diff --git a/NEWS b/NEWS index 6aef47ca311..2dff93c6de7 100644 --- a/NEWS +++ b/NEWS @@ -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 4cb12cb86f4..b5818f83851 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; }