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 029489FE3 for ; Fri, 16 Mar 2012 09:47:27 +0000 (UTC) Received: (qmail 60910 invoked by uid 500); 16 Mar 2012 09:47:27 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 60869 invoked by uid 500); 16 Mar 2012 09:47:27 -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 60862 invoked by uid 99); 16 Mar 2012 09:47:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 09:47:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 09:47:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7D1DC2388980; Fri, 16 Mar 2012 09:47:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1301400 - in /httpd/httpd/branches/2.4.x/docs/manual: mod/core.html.en mod/core.xml vhosts/name-based.html.en vhosts/name-based.xml Date: Fri, 16 Mar 2012 09:47:03 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120316094703.7D1DC2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: covener Date: Fri Mar 16 09:47:02 2012 New Revision: 1301400 URL: http://svn.apache.org/viewvc?rev=1301400&view=rev Log: Merge r1301398, r1301399 from trunk: fix a misleading example that implies ServerName has precedence over a ServerAlias. We stop when a vhost matches for any reason (not 2.4 specific). Mention this explicitly. xforms Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.html.en httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en?rev=1301400&r1=1301399&r2=1301400&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en (original) +++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en Fri Mar 16 09:47:02 2012 @@ -3755,6 +3755,10 @@ to name-virtual hosts </VirtualHost>

+

Name-based virtual hosts for the best-matching set of <virtualhost>s are processsed + in the order they appear in the configuration. The first matching ServerName or ServerAlias is used, with no different precedence for wildcards + (nor for ServerName vs. ServerAlias).

+

See also

  • UseCanonicalName
  • 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=1301400&r1=1301399&r2=1301400&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 Fri Mar 16 09:47:02 2012 @@ -3746,6 +3746,13 @@ to name-virtual hosts # ...
    </VirtualHost> + +

    Name-based virtual hosts for the best-matching set of virtualhosts are processsed + in the order they appear in the configuration. The first matching ServerName or ServerAlias is used, with no different precedence for wildcards + (nor for ServerName vs. ServerAlias).

    UseCanonicalName Apache HTTP Server Virtual Host documentation Modified: httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.html.en URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.html.en?rev=1301400&r1=1301399&r2=1301400&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.html.en (original) +++ httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.html.en Fri Mar 16 09:47:02 2012 @@ -118,7 +118,7 @@ # This first-listed virtual host is also the default for *:80 ServerName www.example.com
    - ServerAlias example.com *.example.com
    + ServerAlias example.com
    DocumentRoot /www/domain
    </VirtualHost>
    @@ -153,6 +153,10 @@ first have your DNS server properly configured to map those names to an IP address associated with your server.

    +

    Name-based virtual hosts for the best-matching set of <virtualhost>s are processsed + in the order they appear in the configuration. The first matching ServerName or ServerAlias is used, with no different precedence for wildcards + (nor for ServerName vs. ServerAlias).

    +

    Finally, you can fine-tune the configuration of the virtual hosts by placing other directives inside the <VirtualHost> containers. Most directives can be placed in these containers and will then change the configuration only of 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=1301400&r1=1301399&r2=1301400&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 Fri Mar 16 09:47:02 2012 @@ -132,7 +132,7 @@ # This first-listed virtual host is also the default for *:80 ServerName www.example.com
    - ServerAlias example.com *.example.com
    + ServerAlias example.com
    DocumentRoot /www/domain
    </VirtualHost>
    @@ -171,6 +171,13 @@ first have your DNS server properly configured to map those names to an IP address associated with your server.

    +

    Name-based virtual hosts for the best-matching set of virtualhosts are processsed + in the order they appear in the configuration. The first matching ServerName or ServerAlias is used, with no different precedence for wildcards + (nor for ServerName vs. ServerAlias).

    +

    Finally, you can fine-tune the configuration of the virtual hosts by placing other directives inside the VirtualHost containers. Most directives can be