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 8ffa964c6b9c64ed119a4a2527ab26ab377da00c..e31c7484875bb92bdc9e8abecbf7c8d4683c8a13 100644 (file)
--- 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 0407379757ed69c39401b240c1c8715d4091ef05..1da5223e1b39df4a1c74e9487901bc4107a533ed 100644 (file)
--- 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);
 }