Commit 77626c57 authored by Graham Leggett's avatar Graham Leggett
Browse files

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
parent 03bd40af

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ Changes with Apache 2.3.15 
     PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener,

     <lowprio20 gmail.com>]



  *) 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]

modules/filters/mod_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }