covener at apache
Nov 18, 2009, 8:18 AM
Post #1 of 1
(185 views)
Permalink
|
|
svn commit: r881824 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/filters/mod_charset_lite.c
|
|
Author: covener
Date: Wed Nov 18 16:18:06 2009
New Revision: 881824
URL: http://svn.apache.org/viewvc?rev=881824&view=rev
Log:
Backport r829657 from trunk:
mod_charsert_lite: Start honoring the 'NoImplicitAdd' CharsetOption.
Unsettable since 2.2.9, before that a no-op.
Reviewed By: covener, trawick, poirier
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/filters/mod_charset_lite.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=881824&r1=881823&r2=881824&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Nov 18 16:18:06 2009
@@ -8,6 +8,9 @@
control is still vulnerable, unless using OpenSSL >= 0.9.8l.
[Joe Orton, Ruediger Pluem]
+ *) mod_charset_lite: Honor 'CharsetOptions NoImplicitAdd'.
+ [Eric Covener]
+
*) mod_rewrite: Make sure that a hostname:port isn't fully qualified if
the request is a CONNECT request. PR 47928
[Bill Zajac <billz consultla.com>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=881824&r1=881823&r2=881824&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Nov 18 16:18:06 2009
@@ -87,17 +87,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_charset_lite: Start honoring the 'NoImplicitAdd' CharsetOption, and document
- behavior correctly.
-
- Trunk Patch: http://svn.apache.org/viewvc?rev=829657&view=rev
- http://svn.apache.org/viewvc?rev=829664&view=rev
- http://svn.apache.org/viewvc?rev=829667&view=rev
-
- 2.2.x Patch: http://people.apache.org/~covener/2.2.x-xlate_lite-noimplicitadd.diff (no code conflicts)
- +1: covener, trawick (without unrelated generated html), poirier
- (without unrelated generated html)
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[. New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/filters/mod_charset_lite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/mod_charset_lite.c?rev=881824&r1=881823&r2=881824&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/mod_charset_lite.c (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/mod_charset_lite.c Wed Nov 18 16:18:06 2009
@@ -181,7 +181,7 @@
else if (!strcasecmp(flag, "NoImplicitAdd")) {
dc->implicit_add = IA_NOIMPADD;
}
- if (!strcasecmp(flag, "TranslateAllMimeTypes")) {
+ else if (!strcasecmp(flag, "TranslateAllMimeTypes")) {
dc->force_xlate = FX_FORCE;
}
else if (!strcasecmp(flag, "NoTranslateAllMimeTypes")) {
@@ -337,6 +337,15 @@
charset_dir_t *dc = ap_get_module_config(r->per_dir_config,
&charset_lite_module);
+ if (dc && (dc->implicit_add == IA_NOIMPADD)) {
+ if (dc->debug >= DBGLVL_GORY) {
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "xlate output filter not added implicitly because "
+ "CharsetOptions included 'NoImplicitAdd'");
+ }
+ return;
+ }
+
if (reqinfo) {
if (reqinfo->output_ctx && !configured_on_output(r, XLATEOUT_FILTER_NAME)) {
ap_add_output_filter(XLATEOUT_FILTER_NAME, reqinfo->output_ctx, r,
|
