Change "DefaultHandler" to "Fallback" as discussed on list and

today on IRC, in the hope that everyone will be satisfied.
PR: 47184 + subsequent veto of original directive name

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

diff --git a/CHANGES b/CHANGES
index 93b8494e11a47301675cca5d622c8cabac5d8be9..0d6494c9007771bbe6c81f171dc63ce8bbe5d791 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -105,7 +105,7 @@ Changes with Apache 2.3.3
   *) mod_alias: ensure Redirect issues a valid URL.
      PR 44020 [Håkon Stordahl <hakon stordahl.org>]
 
-  *) mod_dir: add DefaultHandler directive, to enable admin to specify
+  *) mod_dir: add Fallback directive, to enable admin to specify
      an action to happen when a URL maps to no file, without resorting
      to ErrorDocument or mod_rewrite.  PR 47184 [Nick Kew]
 

diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml
index 5ed2888ff3afd77deecba9a54e5f3f3b4b7fca3e..8f52dc98490daab68427258af535a998f6aa156c 100644 (file)
--- a/docs/manual/mod/mod_dir.xml
+++ b/docs/manual/mod/mod_dir.xml
@@ -157,9 +157,9 @@ a directory</description>
 </usage>
 </directivesynopsis>
 <directivesynopsis>
-<name>DefaultMapping</name>
+<name>Fallback</name>
 <description>Define a default URL for requests that don't map to a file</description>
-<syntax>DefaultMapping <var>local-url</var></syntax>
+<syntax>Fallback <var>local-url</var></syntax>
 <default>None - httpd will return 404 (Not Found)</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
@@ -169,10 +169,10 @@ a directory</description>
     in your filesystem, and would otherwise return HTTP 404 (Not Found).
     For example</p>
     <example>
-        <code>DefaultMapping default.php</code>
+        <code>Fallback not-404.php</code>
     </example>
     <p>will cause requests for non-existent files to be handled by
-    <code>default.php</code>, while requests for files that exist
+    <code>not-404.php</code>, while requests for files that exist
     are unaffected.</p>
 </usage>
 </directivesynopsis>

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 527842e078a1ad8326c6316823db2767169517e8..d9efd539db6e65cb2ff67ddd7ce0c1b2bd0ea452 100644 (file)
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -83,7 +83,7 @@ static const char *configure_slash(cmd_parms *cmd, void *d_, int arg)
 
 static const command_rec dir_cmds[] =
 {
-    AP_INIT_TAKE1("DefaultMapping", ap_set_string_slot,
+    AP_INIT_TAKE1("Fallback", ap_set_string_slot,
                   (void*)APR_OFFSETOF(dir_config_rec, dflt),
                   DIR_CMD_PERMS, "Set a default handler"),
     AP_INIT_RAW_ARGS("DirectoryIndex", add_index, NULL, DIR_CMD_PERMS,
@@ -128,7 +128,7 @@ static int fixup_dflt(request_rec *r)
     if (name_ptr == NULL) {
         return DECLINED;
     }
-    /* XXX: if DefaultHandler points to something that doesn't exist,
+    /* XXX: if Fallback points to something that doesn't exist,
      * this may recurse until it hits the limit for internal redirects
      * before returning an Internal Server Error.
      */