You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/12/23 12:22:35 UTC
svn commit: r1222643 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
modules/http/mod_mime.c
Author: minfrin
Date: Fri Dec 23 11:22:35 2011
New Revision: 1222643
URL: http://svn.apache.org/viewvc?rev=1222643&view=rev
Log:
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.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/modules/http/mod_mime.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 23 11:22:35 2011
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222473
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1222643&r1=1222642&r2=1222643&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Dec 23 11:22:35 2011
@@ -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]
Modified: httpd/httpd/branches/2.4.x/modules/http/mod_mime.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http/mod_mime.c?rev=1222643&r1=1222642&r2=1222643&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http/mod_mime.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http/mod_mime.c Fri Dec 23 11:22:35 2011
@@ -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, ';'))) {