From: Eric Covener Date: Mon, 22 Dec 2014 00:44:19 +0000 (+0000) Subject: Merge r1647229 from trunk: X-Git-Tag: 2.4.11~73 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b76474c9f45b8bd92b2296756cda031bf3432c9;p=apache 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 639849289f..b901850ccd 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -3804,8 +3804,10 @@ itself server).

If no ServerName 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.

+ +

If no port is specified in the ServerName, 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 4bac3fc229..c64df7e19d 100644 --- a/docs/manual/vhosts/name-based.xml +++ b/docs/manual/vhosts/name-based.xml @@ -76,6 +76,12 @@ module="core">ServerAlias directives to the server name present in the request.

+

If you omit the ServerName + 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.

+
The default name-based vhost for an IP and port combination

If no matching ServerName or ServerAlias is found in the set of virtual hosts containing the most specific matching IP address and port