From cd07e1a8b87f898195aab78c09837c3c80a8a2f6 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Fri, 23 Dec 2011 11:22:35 +0000 Subject: [PATCH] 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 --- CHANGES | 4 ++++ modules/http/mod_mime.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 763955f8da..eb50f19b78 100644 --- 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 9e4455445d..f92119b633 100644 --- 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, ';'))) { -- 2.40.0