mod_speling: make behavior of CheckCaseOnly and

the new CheckBasenameMatch orthogonal, so one
can combine them and they don't influence each
other.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732273 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_speling.xml b/docs/manual/mod/mod_speling.xml
index e88916abe8a8f928d1dc6d37c798bccd959f41f7..5e53a2b86496d7c5550f050962bced08b3c3cb0c 100644 (file)
--- a/docs/manual/mod/mod_speling.xml
+++ b/docs/manual/mod/mod_speling.xml
@@ -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 conjunction with
 <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>
 

diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index ea2bdbc92fad5e8adf24dc315519494d0803d065..d0ac5b2b98de9df8984112562e9596da58da86bd 100644 (file)
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -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