From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 9 Nov 2006 19:10:56 +0000 (+0000)
Subject: MFH: Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
X-Git-Tag: php-4.4.5RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b496675bf45acffed11b3d792609dbb6b7ad51e7;p=php

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

diff --git a/NEWS b/NEWS
index 5cfec9dc10..52cdfd0f6d 100644
--- 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 8527d97bea..03e9950a86 100644
--- 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;
 		}