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

ErrorDocument).

diff --git a/NEWS b/NEWS
index 5cfec9dc105d870dfbe0c025ea86d36abb4f1f0d..52cdfd0f6d0ccd9054d097f57a0c9fa52f0ecbff 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,8 @@ PHP 4                                                                      NEWS
   enabled. (Stefan E.)
 - Fixed a memory corruption error with an invalid foreach() call. (Stefan E.,
   Dmitry, Derick)
+- Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
+  ErrorDocument). (Ilia)
 - Fixed bug #38431 (xmlrpc_get_type() crashes PHP on objects). (Tony)
 - Fixed bug #38377 (session_destroy() gives warning after
   session_regenerate_id()). (Ilia)

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 8527d97beaf803ac8596f45784919c3451a021cb..03e9950a869f491bdea875fb2bd786319138f5ad 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -551,7 +551,7 @@ normal:
                }
                
                /* 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;
                }