From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 22 Oct 2018 20:45:11 +0000 (+0000)
Subject: Retsore 2.4.x default behavior modified in r1557580.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea3db733339f0848d2e185b4c990a7951774fd0f;p=thirdparty%2Fapache%2Fhttpd.git

Retsore 2.4.x default behavior modified in r1557580.
Update doc accordingly.

Slightly tweak mod_speling doc

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

diff --git a/docs/manual/mod/mod_speling.xml b/docs/manual/mod/mod_speling.xml
index 5e53a2b8649..54f9d7684c1 100644
--- a/docs/manual/mod/mod_speling.xml
+++ b/docs/manual/mod/mod_speling.xml
@@ -44,21 +44,23 @@ misspellings.</description>
     <strong>up to one misspelling</strong> (character insertion /
     omission / transposition or wrong character). A list is built
     with all document names which were matched using this
-    strategy.</p>
+    strategy. <strong>Erroneous extension</strong> can also be fixed
+    by this module.</p>
 
     <p>If, after scanning the directory,</p>
 
     <ul>
       <li>no matching document was found, Apache will proceed as
-      usual and return a "document not found" error.</li>
+      usual and return an error (<code>404 - document not found</code>).</li>
 
       <li>only one document is found that "almost" matches the
       request, then it is returned in the form of a redirection
-      response.</li>
+      response (<code>301 - Moved Permanently</code>).</li>
 
       <li>more than one document with a close match was found, then
       the list of the matches is returned to the client, and the
-      client can select the correct candidate.</li>
+      client can select the correct candidate (<code>300 - Multiple
+      Choices</code>).</li>
     </ul>
 
 </summary>
@@ -103,7 +105,7 @@ module</description>
     </ul>
 
     <!-- XXX: is that really true?! -nd -->
-    <p>mod_speling should not be enabled in <a href="mod_dav.html">DAV</a>
+    <p><module>mod_speling</module> should not be enabled in <a href="mod_dav.html">DAV</a>
     enabled directories, because it will try to "spell fix" newly created
     resource names against existing filenames, e.g., when trying to upload
     a new document <code>doc43.html</code> it might redirect to an existing
@@ -128,7 +130,7 @@ 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,
-    except when <directive>CheckBasenameMatch</directive> is also set.</p>
+    except when <directive module="mod_speling">CheckBasenameMatch</directive> is also set.</p>
 </usage>
 </directivesynopsis>
 
@@ -136,7 +138,7 @@ module</description>
 <name>CheckBasenameMatch</name>
 <description>Also match files with differing file name extensions.</description>
 <syntax>CheckBasenameMatch on|off</syntax>
-<default>CheckBasenameMatch Off</default>
+<default>CheckBasenameMatch On</default>
 <contextlist>
 <context>server config</context>
 <context>virtual host</context>
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index b0f4b8fe0ee..35d33ea03d5 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -76,7 +76,7 @@ static void *mkconfig(apr_pool_t *p)
 
     cfg->enabled = 0;
     cfg->check_case_only = 0;
-    cfg->check_basename_match = 0;
+    cfg->check_basename_match = 1;
     return cfg;
 }