Commit 161c6242 authored by Nick Kew's avatar Nick Kew
Browse files

Fix mod_deflate to work in an internal redirect 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395986 13f79535-47bb-0310-9956-ffa450edef68
parent 6d17d530

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.2









  *) mod_deflate: work correctly in an internal redirect









     [Brian J. France <list firehawksystems com>]

















  *) core: Prevent reading uninitialized memory while reading a line of









     protocol input.  PR 39282. [Davi Arnaut <davi haxent.com.br>]










































STATUS



+0
−4



























Changes for STATUS: 0 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -83,10 +83,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:







          Trunk version works









      +1: trawick, colm, jim



















    *) mod_deflate: handle internal redirects correctly









         http://svn.apache.org/viewcvs?rev=395079&view=rev









       +1: colm, wrowe, niq



















    * mod_proxy: Do not release connections from connection pool twice as this









                 can cause different threads to use the same connection at the









                 same time. PR 38793.


































modules/filters/mod_deflate.c



+1
−1



























Changes for modules/filters/mod_deflate.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -240,7 +240,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,







        const char *encoding;



















        /* only work on main request/no subrequests */









        if (!ap_is_initial_req(r)) {









        if (r->main != NULL) {









            ap_remove_output_filter(f);









            return ap_pass_brigade(f->next, bb);









        }