Backport:

mod_mime: Don't arbitrarily bypass AddOutputFilter during a ProxyPass,
but then allow AddOutputFilter during a RewriteRule [P]. Make mod_mime
behave identically in both cases. PR52342.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1222643 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 763955f8daf3b036ad9d17346b5f66b1f4234205..eb50f19b78c7c0f91514b62d6245261733ede558 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.0
 
+  *) mod_mime: Don't arbitrarily bypass AddOutputFilter during a ProxyPass,
+     but then allow AddOutputFilter during a RewriteRule [P]. Make mod_mime
+     behave identically in both cases. PR52342. [Graham Leggett]
+
   *) Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with
      corresponding man pages. [Graham Leggett]
 

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 9e4455445d69b371c7e659e92d024a10efdc7994..f92119b633e474632efb6b48df1f99158d1b316b 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -895,7 +895,7 @@ static int find_ct(request_rec *r)
              * setting redundant filters.    2, we insert these in the types
              * config hook, which may be too early (dunno.)
              */
-            if (exinfo->input_filters && r->proxyreq == PROXYREQ_NONE) {
+            if (exinfo->input_filters) {
                 const char *filter, *filters = exinfo->input_filters;
                 while (*filters
                     && (filter = ap_getword(r->pool, &filters, ';'))) {
@@ -905,7 +905,7 @@ static int find_ct(request_rec *r)
                     found = 1;
                 }
             }
-            if (exinfo->output_filters && r->proxyreq == PROXYREQ_NONE) {
+            if (exinfo->output_filters) {
                 const char *filter, *filters = exinfo->output_filters;
                 while (*filters
                     && (filter = ap_getword(r->pool, &filters, ';'))) {