Merge r1647229 from trunk:

some tweaks for no ServerName from PR57384

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1647230 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 639849289fa9463ebb818c45e7148bbe966775ee..b901850ccdf0afb8c42e8623686de99f9ce1e57c 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3804,8 +3804,10 @@ itself</description>
     server).</p>
 
     <p>If no <directive>ServerName</directive> is specified, then the
-    server attempts to deduce the hostname by performing a reverse
-    lookup on the IP address. If no port is specified in the
+    server attempts to deduce the client visible hostname by performing a
+    reverse lookup on an IP address of the systems hostname.</p>
+    
+    <p>If no port is specified in the
     <directive>ServerName</directive>, then the server will use the
     port from the incoming request. For optimal reliability and
     predictability, you should specify an explicit hostname and port

diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index 4bac3fc229a670ab955136918327bc521f07662f..c64df7e19d9e94c4fd5d575ed438c52a2f267758 100644 (file)
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -76,6 +76,12 @@
     module="core">ServerAlias</directive> directives to the server name
     present in the request.</p>
 
+    <p>If you omit the <directive module="core">ServerName</directive> 
+    directive from any name-based virtual host, the server will default
+    to a fully qualified domain name (FQDN) derived from the system hostname.
+    This implicitly set server name can lead to counter-intuitive virtual host
+    matching and is discouraged.</p>
+ 
     <section id="defaultvhost"><title>The default name-based vhost for an IP and port combination </title>
     <p> If no matching ServerName or ServerAlias is found in the set of
     virtual hosts containing the most specific matching IP address and port