From: Joe Orton <jorton@php.net>
Date: Tue, 11 Jan 2005 14:09:56 +0000 (+0000)
Subject: MFH: Fixed bug #30446 - virtual() includes files out of sequence,
X-Git-Tag: php-4.3.11RC1~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15a00ec902bd5f9aac280510d08ef8f33ccd654a;p=php

MFH: Fixed bug #30446 - virtual() includes files out of sequence,
work around 2.0 subrequest/internal redirect issue.
---

diff --git a/NEWS b/NEWS
index 8ffa964c6b..e31c748487 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PHP 4                                                                      NEWS
   y2k_compliance is On). (Ilia)
 - Fixed bug #31055 (apache2filter: per request leak proportional to the full
   path of the request URI). (kameshj at fastmail dot fm)
+- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)
 - Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
   (eggert at gnu dot org)
 - Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 0407379757..1da5223e1b 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -63,6 +63,11 @@ static request_rec *php_apache_lookup_uri(char *filename TSRMLS_DC)
 	}
 	
 	ctx = SG(server_context);
+
+	/* Ensure that the ap_r* layer is flushed, to work around 2.0 bug:
+	 * http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */
+	ap_rflush(ctx->r);
+
 	return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters);
 }