Fixed bug #30446 - virtual() includes files out of sequence,

work around 2.0 subrequest/internal redirect issue.

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 4c043711e5ec7f107f635120e5b512437c850238..ff35591143f92aedcedfe36a6e7032c70013207f 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);
 }