MFH: Fixed regression #31645 - only flush before running the subrequest.

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 631e56a1ddd1b0e2e90b0d81063f2538fe72fc4f..20490b986a168510f34a46e8471bed269da2c1b3 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -66,10 +66,6 @@ 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);
 }
 
@@ -102,6 +98,10 @@ PHP_FUNCTION(virtual)
        php_end_ob_buffers(1 TSRMLS_CC);
        php_header(TSRMLS_C);
 
+       /* Ensure that the ap_r* layer for the main request is flushed, to
+        * work around http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */
+       ap_rflush(rr->main);
+
        if (ap_run_sub_req(rr)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - request execution failed", Z_STRVAL_PP(filename));
                ap_destroy_sub_req(rr);