Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F32ADC769 for ; Mon, 22 Dec 2014 00:44:20 +0000 (UTC) Received: (qmail 34658 invoked by uid 500); 22 Dec 2014 00:44:20 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 34594 invoked by uid 500); 22 Dec 2014 00:44:20 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 34583 invoked by uid 99); 22 Dec 2014 00:44:20 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2014 00:44:20 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 63291AC0E92; Mon, 22 Dec 2014 00:44:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1647230 - in /httpd/httpd/branches/2.4.x/docs/manual: mod/core.xml vhosts/name-based.xml Date: Mon, 22 Dec 2014 00:44:20 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141222004420.63291AC0E92@hades.apache.org> Author: covener Date: Mon Dec 22 00:44:19 2014 New Revision: 1647230 URL: http://svn.apache.org/r1647230 Log: Merge r1647229 from trunk: some tweaks for no ServerName from PR57384 Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1647230&r1=1647229&r2=1647230&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original) +++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Mon Dec 22 00:44:19 2014 @@ -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 Modified: httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml?rev=1647230&r1=1647229&r2=1647230&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml (original) +++ httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml Mon Dec 22 00:44:19 2014 @@ -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