diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 006b642334..6e63446120 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3109,7 +3109,7 @@ requests</td></tr>
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures how the server determines its own name and
 port</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>UseCanonicalName On|Off|DNS</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>UseCanonicalName On</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>UseCanonicalName Off</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index d845d583e2..6205ab1ae5 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3079,7 +3079,7 @@ requests</description>
 <description>Configures how the server determines its own name and
 port</description>
 <syntax>UseCanonicalName On|Off|DNS</syntax>
-<default>UseCanonicalName On</default>
+<default>UseCanonicalName Off</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context></contextlist>
 
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index f386cc72d7..b4d57640ab 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:330409 (outdated) -->
+<!-- English Revision: 167959:344369 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index b8260aad0a..26337e9689 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:330409 (outdated) -->
+<!-- English Revision: 190982:344369 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 520f0311df..5e62e4aca1 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -722,7 +722,7 @@ requests</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
 <tr><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
 ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes variables from the environment</td></tr>
-<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> On </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
 <tr><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
diff --git a/docs/manual/server-wide.xml.ja b/docs/manual/server-wide.xml.ja
index 9b2b7ca274..735dc994cb 100644
--- a/docs/manual/server-wide.xml.ja
+++ b/docs/manual/server-wide.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:344369 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/server-wide.xml.ko b/docs/manual/server-wide.xml.ko
index a8f6b97597..61f791e32a 100644
--- a/docs/manual/server-wide.xml.ko
+++ b/docs/manual/server-wide.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:344369 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/server-wide.xml.meta b/docs/manual/server-wide.xml.meta
index 2c1fe78d4a..b7f3c1db76 100644
--- a/docs/manual/server-wide.xml.meta
+++ b/docs/manual/server-wide.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/server/core.c b/server/core.c
index 78ca71955d..cd71ce7991 100644
--- a/server/core.c
+++ b/server/core.c
@@ -913,7 +913,6 @@ AP_DECLARE(const char *) ap_get_server_name(request_rec *r)
 
     switch (d->use_canonical_name) {
         case USE_CANONICAL_NAME_ON:
-        case USE_CANONICAL_NAME_UNSET:
             retval = r->server->server_hostname;
             break;
         case USE_CANONICAL_NAME_DNS:
@@ -929,6 +928,7 @@ AP_DECLARE(const char *) ap_get_server_name(request_rec *r)
             retval = conn->local_host;
             break;
         case USE_CANONICAL_NAME_OFF:
+        case USE_CANONICAL_NAME_UNSET:
             retval = r->hostname ? r->hostname : r->server->server_hostname;
             break;
         default:
@@ -966,6 +966,7 @@ AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r)
     switch (d->use_canonical_name) {
         case USE_CANONICAL_NAME_OFF:
         case USE_CANONICAL_NAME_DNS:
+        case USE_CANONICAL_NAME_UNSET:
             if (d->use_canonical_phys_port == USE_CANONICAL_PHYS_PORT_ON)
                 port = r->parsed_uri.port_str ? r->parsed_uri.port :
                        r->connection->local_addr->port ? r->connection->local_addr->port :
@@ -977,7 +978,6 @@ AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r)
                        ap_default_port(r);
             break;
         case USE_CANONICAL_NAME_ON:
-        case USE_CANONICAL_NAME_UNSET:
             /* With UseCanonicalName on (and in all versions prior to 1.3)
              * Apache will use the hostname and port specified in the
              * ServerName directive to construct a canonical name for the