From: Eric Covener <covener@apache.org>
Date: Thu, 17 Dec 2020 14:41:53 +0000 (+0000)
Subject: PR64997: clarify hostnames inside <virtualhost> tag
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1071
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e53c8748e0819ff37e84249c82f5dd3d8c2f469;p=thirdparty%2Fapache%2Fhttpd.git

PR64997: clarify hostnames inside <virtualhost> tag


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

diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index b6651b734ba..4f0ede6487e 100644
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -187,17 +187,23 @@
     first have your DNS server properly configured to map those names to an IP
     address associated with your server.</p>
 
+    <p>Typically, IP addresses of local interfaces or the wildcard '*' are specified within the 
+    <directive type="section" module="core">virtualhost</directive> tag and hostnames are
+    specified only in <directive module="core">ServerName</directive> or <directive module="core"
+    >ServerAlias</directive>.  When a hostname is specified within the virtualhost tag,
+    its addresses are resolved and added for IP based virtual host resolution and the hostname:port
+    combination is also checked prior to ServerName and ServerAlias checks for name-based virtual host
+    resolution.  The use of hostnames within the virtualhost tag is relatively obscure, error prone,
+    and should generally be avoided.
+    </p>
+
     <p>Name-based virtual hosts for the best-matching set of  <directive
     type="section" module="core">virtualhost</directive>s are processed
     in the order they appear in the configuration.  The first matching <directive
     module="core">ServerName</directive> or <directive module="core"
     >ServerAlias</directive> is used, with no different precedence for wildcards
-    (nor for ServerName vs. ServerAlias).  </p>
-
-    <p>The complete list of names in the <directive module="core"
-    >VirtualHost</directive>
-    directive are treated just like a (non wildcard)
-    <directive module="core">ServerAlias</directive>.</p>
+    (nor for ServerName vs. ServerAlias).  
+    </p>
 
     <p>Finally, you can fine-tune the configuration of the virtual hosts
     by placing other directives inside the <directive type="section"