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

diff --git a/CHANGES b/CHANGES
index 7ee7871642ed73d16d96bb76cf821bfee19cac69..c53d29e282687694336fdbd39d3d5329bc93f873 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- 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>]
 

diff --git a/STATUS b/STATUS
index b8bbd1d5a2760391bf171e7dcf207bbbb95ecf63..c61dc660a7f28465b60f6f7972a6458443828a04 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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.

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 41bdbcccc79641bbfd4726e871023f3b7cc366a3..3e0462321f35d6af2a295997ecc707d0dec0c622 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);
         }