httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r829664 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_charset_lite.html.en docs/manual/mod/mod_charset_lite.xml modules/filters/mod_charset_lite.c
Date Sun, 25 Oct 2009 22:06:18 GMT
Author: covener
Date: Sun Oct 25 22:06:18 2009
New Revision: 829664

URL: http://svn.apache.org/viewvc?rev=829664&view=rev
Log:
CharsetOptions NoImplicitAdd wasn't referenced during insert_filter callback.

Doc: Correct defaults, charset_lite inserts itself by as soon as you tell it about
input and output character sets.


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.xml
    httpd/httpd/trunk/modules/filters/mod_charset_lite.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=829664&r1=829663&r2=829664&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Oct 25 22:06:18 2009
@@ -10,6 +10,9 @@
      mod_proxy_ftp: NULL pointer dereference on error paths.
      [Stefan Fritsch <sf fritsch.de>, Joe Orton]
 
+  *) mod_charset_lite: Honor 'CharsetOptions NoImplicitAdd'.
+     [Eric Covener]
+
   *) mod_ssl: Add support for OCSP Stapling.  PR 43822.  
      [Dr Stephen Henson <shenson oss-institute.org>]
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.html.en?rev=829664&r1=829663&r2=829664&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.html.en Sun Oct 25 22:06:18 2009
@@ -126,7 +126,7 @@
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures
charset translation behavior</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CharsetOptions
<var>option</var> [<var>option</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CharsetOptions
DebugLevel=0 NoImplicitAdd</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CharsetOptions
DebugLevel=0 ImplicitAdd</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.xml?rev=829664&r1=829663&r2=829664&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.xml Sun Oct 25 22:06:18 2009
@@ -150,7 +150,7 @@
 <name>CharsetOptions</name>
 <description>Configures charset translation behavior</description>
 <syntax>CharsetOptions <var>option</var> [<var>option</var>]
...</syntax>
-<default>CharsetOptions DebugLevel=0 NoImplicitAdd</default>
+<default>CharsetOptions DebugLevel=0 ImplicitAdd</default>
 <contextlist><context>server config</context>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context>

Modified: httpd/httpd/trunk/modules/filters/mod_charset_lite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_charset_lite.c?rev=829664&r1=829663&r2=829664&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_charset_lite.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_charset_lite.c Sun Oct 25 22:06:18 2009
@@ -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,



Mime
View raw message