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 b98ffe45f3d63fe43c27ceadd46a81cb6132d5f2..92379c73f2a4c51d0d38b1f7e6e92157e60e9e8c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ PHP                                                                        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, Jani)
 - 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 eeba18a691994f4b0c0be91f19b4d0394e53c9e0..631e56a1ddd1b0e2e90b0d81063f2538fe72fc4f 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -65,6 +65,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);
 }