From: Joe Orton <jorton@php.net>
Date: Mon, 24 Jan 2005 11:44:56 +0000 (+0000)
Subject: Fixed regression #31645 - only flush before running the subrequest.
X-Git-Tag: RELEASE_0_2~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62121a184053b9bbd3deb917bad69d8b23988e33;p=php

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

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index ff35591143..17eb5723f5 100644
--- 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);