httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
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 GMT
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</td></tr>
       &lt;/VirtualHost&gt;
     </code></p></div>
 
+    <p>Name-based virtual hosts for the best-matching set of  <code class="directive"><a
href="#virtualhost">&lt;virtualhost&gt;</a></code>s are processsed
+    in the order they appear in the configuration.  The first matching <code class="directive"><a
href="#servername">ServerName</a></code> or <code class="directive"><a
href="#serveralias">ServerAlias</a></code> is used, with no different precedence
for wildcards
+    (nor for ServerName vs. ServerAlias).  </p>
+
 <h3>See also</h3>
 <ul>
 <li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>

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</description>
       # ...<br />
       &lt;/VirtualHost&gt;
     </example>
+
+    <p>Name-based virtual hosts for the best-matching set of  <directive
+    type="section" module="core">virtualhost</directive>s are processsed
+    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>
 </usage>
 <seealso><directive module="core">UseCanonicalName</directive></seealso>
 <seealso><a href="../vhosts/">Apache HTTP Server Virtual Host documentation</a></seealso>

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 @@
         <span class="indent">
             # This first-listed virtual host is also the default for *:80
             ServerName www.example.com<br />
-            ServerAlias example.com *.example.com<br />
+            ServerAlias example.com <br />
             DocumentRoot /www/domain<br />
         </span>
         &lt;/VirtualHost&gt;<br />
@@ -153,6 +153,10 @@
     first have your DNS server properly configured to map those names to an IP
     address associated with your server.</p>
 
+    <p>Name-based virtual hosts for the best-matching set of  <code class="directive"><a
href="../mod/core.html#virtualhost">&lt;virtualhost&gt;</a></code>s
are processsed 
+    in the order they appear in the configuration.  The first matching <code class="directive"><a
href="../mod/core.html#servername">ServerName</a></code> or <code class="directive"><a
href="../mod/core.html#serveralias">ServerAlias</a></code> is used, with no
different precedence for wildcards
+    (nor for ServerName vs. ServerAlias).  </p>
+
     <p>Finally, you can fine-tune the configuration of the virtual hosts
     by placing other directives inside the <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
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 @@
         <indent>
             # This first-listed virtual host is also the default for *:80
             ServerName www.example.com<br />
-            ServerAlias example.com *.example.com<br />
+            ServerAlias example.com <br />
             DocumentRoot /www/domain<br />
         </indent>
         &lt;/VirtualHost&gt;<br />
@@ -171,6 +171,13 @@
     first have your DNS server properly configured to map those names to an IP
     address associated with your server.</p>
 
+    <p>Name-based virtual hosts for the best-matching set of  <directive
+    type="section" module="core">virtualhost</directive>s are processsed 
+    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>Finally, you can fine-tune the configuration of the virtual hosts
     by placing other directives inside the <directive type="section"
     module="core">VirtualHost</directive> containers. Most directives can be



Mime
View raw message