diff options
| author | Joe Orton <jorton@php.net> | 2005-01-24 11:48:35 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@php.net> | 2005-01-24 11:48:35 +0000 |
| commit | 54a1e6c07a5e44cfa0af297f322e7de263b17332 (patch) | |
| tree | 2cb2f3811591e3062fc9b05aac7d91878ec109f1 /sapi/apache2handler/php_functions.c | |
| parent | f04cf8344c2dbd0ed2ecb764f29b1459740219ef (diff) | |
| download | php-git-54a1e6c07a5e44cfa0af297f322e7de263b17332.tar.gz | |
MFH: Fixed regression #31645 - only flush before running the subrequest.
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 1da5223e1b..2763da0194 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -64,10 +64,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); } @@ -100,6 +96,10 @@ PHP_FUNCTION(virtual) php_end_ob_buffers(1 TSRMLS_CC); php_header(); + /* 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); |