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

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 3f548f288a..a80baeea3b 100644
--- 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;
 		}