MFB: Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php

ErrorDocument).

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 3f548f288afed5dd32e6019818ddff0dc45659e6..a80baeea3b2255d721a226d1df6c0954af57e7ce 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -569,7 +569,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;
                }