]> granicus.if.org Git - apache/commit
Merge r1725102 from trunk:
authorEric Covener <covener@apache.org>
Sun, 17 Jan 2016 16:47:46 +0000 (16:47 +0000)
committerEric Covener <covener@apache.org>
Sun, 17 Jan 2016 16:47:46 +0000 (16:47 +0000)
commitda835b22b5a65869200d7790dd7e6f5695a62e23
tree7ebbf8fae389dc43ea7f06d26cb994bfd922472a
parent9cb45f71b4d242f158e127ab5f9f6e3696938caa
Merge r1725102 from trunk:

update syntax to allow for non-FQDN domains or IP addresses in ServerName.

Since UseCanonicalName defaults to OFF, name-based vhosts isn't really an
"additional" purpose of a ServerName. Also update the syntax to not insist
on an FQDN -- generally the ServerName needs to be something the client
and server can both resolve, but it's not required to be an FQDN or even
a domain name.

Leave the example as www.example.com

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1725104 13f79535-47bb-0310-9956-ffa450edef68
docs/manual/mod/core.xml