svn commit: r1732273 - in /httpd/httpd/trunk: docs/manual/mod/mod_speling.xml modules/mappers/mod_speling.c

[rj...@apache.org]

Author: rjung
Date: Thu Feb 25 10:09:09 2016
New Revision: 1732273

URL: http://svn.apache.org/viewvc?rev=1732273&view=rev
Log:
mod_speling: make behavior of CheckCaseOnly and
the new CheckBasenameMatch orthogonal, so one
can combine them and they don't influence each
other.

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_speling.xml
    httpd/httpd/trunk/modules/mappers/mod_speling.c

Modified: httpd/httpd/trunk/docs/manual/mod/mod_speling.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_speling.xml?rev=1732273&r1=1732272&r2=1732273&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_speling.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_speling.xml Thu Feb 25 10:09:09 2016
@@ -127,18 +127,14 @@ module</description>
 
 <usage>
     <p>When set, this directive limits the action of the spelling correction
-    to lower/upper case changes.
-    Other potential corrections are not performed.</p>
-
+    to lower/upper case changes.  Other potential corrections are not performed,
+    except when <directive>CheckBasenameMatch</directive> is also set.</p>
 </usage>
 </directivesynopsis>
 
 <directivesynopsis>
 <name>CheckBasenameMatch</name>
-<description>Extend the action of the speling module to also check filename
-without paying attention to the extention. (e.g. foo.gif and foo.jpg).
-This can be particulary useful in conjunction with
-<a href="../content-negotiation.html">MultiViews</a></description>
+<description>Also match files with differing file name extensions.</description>
 <syntax>CheckBasenameMatch on|off</syntax>
 <default>CheckBasenameMatch Off</default>
 <contextlist>
@@ -150,8 +146,11 @@ This can be particulary useful in conjun
 <override>Options</override>
 
 <usage>
-    <p>This option has no effect if <directive>CheckCaseOnly</directive> is set.</p>
-
+    <p>When set, this directive extends the action of the spelling correction
+    to the file name extension. For example a file <code>foo.gif</code> will
+    match a request for <code>foo</code> or <code>foo.jpg</code>. This can be
+    particulary useful in conjunction with
+    <a href="../content-negotiation.html">MultiViews</a>.</p>
 </usage>
 </directivesynopsis>
 

Modified: httpd/httpd/trunk/modules/mappers/mod_speling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_speling.c?rev=1732273&r1=1732272&r2=1732273&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_speling.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_speling.c Thu Feb 25 10:09:09 2016
@@ -326,8 +326,7 @@ static int check_speling(request_rec *r)
          * because it won't find anything matching that spelling.
          * With the extension-munging, it would locate "foobar.html".
          */
-        else if ((cfg->check_case_only == 0) &&
-                 (cfg->check_basename_match == 1)) {
+        else if (cfg->check_basename_match == 1) {
             /*
              * Okay... we didn't find anything. Now we take out the hard-core
              * power tools. There are several cases here. Someone might have