From d6ce9b205037cefe9fa6eef66dac556601577d21 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sun, 23 Oct 2011 13:08:04 +0000 Subject: [PATCH] mod_buffer: Make sure we step down for subrequests, but not for internal redirects triggered by mod_rewrite. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1187880 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/filters/mod_buffer.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 366a1d38cc..f5fe1ca59a 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,9 @@ Changes with Apache 2.3.15 PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener, ] + *) mod_buffer: Make sure we step down for subrequests, but not for internal + redirects triggered by mod_rewrite. [Graham Leggett] + *) mod_lua: add r:construct_url as a wrapper for ap_construct_url. [Eric Covener] diff --git a/modules/filters/mod_buffer.c b/modules/filters/mod_buffer.c index 5e9625de22..cf552aa784 100644 --- a/modules/filters/mod_buffer.c +++ b/modules/filters/mod_buffer.c @@ -66,7 +66,7 @@ static apr_status_t buffer_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) { * it did. Within subrequests, we have no EOS to check for, * so we don't know when to flush the buffer to the network */ - if (!ap_is_initial_req(f->r)) { + if (f->r->main) { ap_remove_output_filter(f); return ap_pass_brigade(f->next, bb); } -- 2.40.0