Commit 103533a3 authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

Correctly handle internal redirects, by testing only for r-main == NULL. 

ap_is_initial_req() returns false for internal redirects.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395079 13f79535-47bb-0310-9956-ffa450edef68
parent e97839d6

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) mod_deflate: Allow mod_deflate to handle internal redirects.









     [ Brian J. France <list firehawksystems.com>] 

















  *) HTML-escape the Expect error message.  Not classed as security as









     an attacker has no way to influence the Expect header a victim will









     send to a target site.  Reported by Thiago Zaninotti


































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);









        }