svn commit: r395079 - in /httpd/httpd/trunk: CHANGES modules/filters/mod_deflate.c

[co...@apache.org]

Author: colm
Date: Tue Apr 18 15:51:55 2006
New Revision: 395079

URL: http://svn.apache.org/viewcvs?rev=395079&view=rev
Log:
Correctly handle internal redirects, by testing only for r-main == NULL.
ap_is_initial_req() returns false for internal redirects.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/filters/mod_deflate.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=395079&r1=395078&r2=395079&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Apr 18 15:51:55 2006
@@ -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

Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/filters/mod_deflate.c?rev=395079&r1=395078&r2=395079&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Tue Apr 18 15:51:55 2006
@@ -240,7 +240,7 @@
         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);
         }