svn commit: r404847 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/filters/mod_charset_lite.c

[ni...@apache.org]

Author: niq
Date: Sun May  7 13:57:32 2006
New Revision: 404847

URL: http://svn.apache.org/viewcvs?rev=404847&view=rev
Log:
Backport trawick's mod_charset_lite patch

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/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=404847&r1=404846&r2=404847&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun May  7 13:57:32 2006
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.3
 
+  *) mod_charset_lite: Bypass translation when the source and dest charsets
+     are the same. [Jeff Trawick]
+
 Changes with Apache 2.2.2
 
   *) mod_deflate: work correctly in an internal redirect

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=404847&r1=404846&r2=404847&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun May  7 13:57:32 2006
@@ -76,17 +76,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * Remove odd DECLINED code from mod_charset_lite filter.
-      http://svn.apache.org/viewcvs?rev=399665&view=rev
-      +1 trawick, rpluem, niq
-      niq: This is right, but the underlying behaviour (refuse to
-      work in a proxy) is bad.  There's a TODO.
-
-    * mod_charset_lite: Don't go through the motions of translating if
-      the source and dest charsets are the same.
-      http://svn.apache.org/viewcvs?rev=399668&view=rev
-      +1 trawick, rpluem, niq
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * Backport mod_authz_dbd (it's had some testing now)

Modified: httpd/httpd/branches/2.2.x/modules/filters/mod_charset_lite.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/filters/mod_charset_lite.c?rev=404847&r1=404846&r2=404847&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 Sun May  7 13:57:32 2006
@@ -232,6 +232,8 @@
     if (!strncmp(r->filename, "gone:", 5)) return DECLINED;
     if (!strncmp(r->filename, "passthrough:", 12)) return DECLINED;
     if (!strncmp(r->filename, "forbidden:", 10)) return DECLINED;
+    /* no translation when server and network charsets are set to the same value */
+    if (!strcasecmp(dc->charset_source, dc->charset_default)) return DECLINED;
 
     mime_type = r->content_type ? r->content_type : ap_default_type(r);
 
@@ -820,9 +822,6 @@
             ctx->noop = 1;
         }
     }
-
-    /* catch proxy requests */
-    if (f->r->proxyreq) return DECLINED;
 
     /* Opening the output translation (this used to be done in the fixup hook,
      * but that was too early: a subsequent type modification, e.g., by a