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

diff --git a/CHANGES b/CHANGES
index 68f4c855d110cec932e2338e4ae86a83f38b2f97..0e6ee2f7fb08e648f9dfeb3b4d52eb212284381e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 4a9ae9831a89c23603a4cb53ce2fd7c11cc259bd..a447ebc5e65f399ddd10fb1435d5fa02756830bc 100644 (file)
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -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);
         }