httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod core.xml core.html.en
Date Thu, 30 May 2002 13:18:54 GMT
slive       02/05/30 06:18:54

  Modified:    docs/manual/mod core.xml core.html.en
  Log:
  Too many people seem to try to use _default_ with name-virtual hosts.
  Maybe this will help?
  
  Revision  Changes    Path
  1.11      +19 -8     httpd-2.0/docs/manual/mod/core.xml
  
  Index: core.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -d -b -u -r1.10 -r1.11
  --- core.xml	27 May 2002 02:22:09 -0000	1.10
  +++ core.xml	30 May 2002 13:18:54 -0000	1.11
  @@ -2456,18 +2456,24 @@
   <usage>
       <p><directive type="section">VirtualHost</directive> and
       <code>&lt;/VirtualHost&gt;</code> are used to enclose a group of
  -    directives which will apply only to a particular virtual host. Any
  -    directive which is allowed in a virtual host context may be
  +    directives that will apply only to a particular virtual host. Any
  +    directive that is allowed in a virtual host context may be
       used. When the server receives a request for a document on a
       particular virtual host, it uses the configuration directives
       enclosed in the <directive type="section">VirtualHost</directive>
       section. <em>Addr</em> can be</p>
   
       <ul>
  -      <li>The IP address of the virtual host</li>
  +      <li>The IP address of the virtual host;</li>
   
         <li>A fully qualified domain name for the IP address of the
  -      virtual host.</li>
  +      virtual host;</li>
  +
  +      <li>The character *, which is used only in combination with
  +      <code>NameVirtualHost *</code> to match all IP addresses; or</li>
  +
  +      <li>The string <code>_default_</code>, which is used only
  +      with IP virtual hosting to catch unmatched IP addresses.</li>
       </ul>
       
   
  @@ -2502,15 +2508,20 @@
       accept IP packets for multiple addresses. (If the machine does
       not have multiple network interfaces, then this can be
       accomplished with the <code>ifconfig alias</code> command (if
  -    your OS supports it), or with kernel patches like <a
  -    href="../misc/vif-info.html">VIF</a> (for SunOS(TM) 4.1.x)).</p>
  +    your OS supports it).</p>
   
  -    <p>The special name <code>_default_</code> can be specified in
  +    <p>When using IP-based virtual hosting, the special name
  +    <code>_default_</code> can be specified in
       which case this virtual host will match any IP address that is
       not explicitly listed in another virtual host. In the absence
       of any _default_ virtual host the "main" server config,
       consisting of all those definitions outside any VirtualHost
  -    section, is used when no match occurs.</p>
  +    section, is used when no IP-match occurs.  (But note that any IP
  +    address that matches a <directive
  +    module="core">NameVirtualHost</directive> directive will never use
  +    the "main" server config.  See the <a
  +    href="../vhosts/name-based.html">name-based virtual hosting</a>
  +    documentation for further details.)</p>
   
       <p>You can specify a <code>:port</code> to change the port that is
       matched. If unspecified then it defaults to the same port as the
  
  
  
  1.4       +17 -7     httpd-2.0/docs/manual/mod/core.html.en
  
  Index: core.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.html.en,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -d -b -u -r1.3 -r1.4
  --- core.html.en	28 May 2002 07:34:59 -0000	1.3
  +++ core.html.en	30 May 2002 13:18:54 -0000	1.4
  @@ -1692,18 +1692,24 @@
       ...&gt; ... &lt;/VirtualHost&gt;</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:</a></td><td>server
config</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status"
class="help">Status:</a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:</a></td><td>core</td></tr></table></td></tr></table>
       <p><code class="directive">&lt;VirtualHost&gt;</code> and
       <code>&lt;/VirtualHost&gt;</code> are used to enclose a group of
  -    directives which will apply only to a particular virtual host. Any
  -    directive which is allowed in a virtual host context may be
  +    directives that will apply only to a particular virtual host. Any
  +    directive that is allowed in a virtual host context may be
       used. When the server receives a request for a document on a
       particular virtual host, it uses the configuration directives
       enclosed in the <code class="directive">&lt;VirtualHost&gt;</code>
       section. <em>Addr</em> can be</p>
   
       <ul>
  -      <li>The IP address of the virtual host</li>
  +      <li>The IP address of the virtual host;</li>
   
         <li>A fully qualified domain name for the IP address of the
  -      virtual host.</li>
  +      virtual host;</li>
  +
  +      <li>The character *, which is used only in combination with
  +      <code>NameVirtualHost *</code> to match all IP addresses; or</li>
  +
  +      <li>The string <code>_default_</code>, which is used only
  +      with IP virtual hosting to catch unmatched IP addresses.</li>
       </ul>
       
   
  @@ -1738,14 +1744,18 @@
       accept IP packets for multiple addresses. (If the machine does
       not have multiple network interfaces, then this can be
       accomplished with the <code>ifconfig alias</code> command (if
  -    your OS supports it), or with kernel patches like <a href="../misc/vif-info.html">VIF</a>
(for SunOS(TM) 4.1.x)).</p>
  +    your OS supports it).</p>
   
  -    <p>The special name <code>_default_</code> can be specified in
  +    <p>When using IP-based virtual hosting, the special name
  +    <code>_default_</code> can be specified in
       which case this virtual host will match any IP address that is
       not explicitly listed in another virtual host. In the absence
       of any _default_ virtual host the "main" server config,
       consisting of all those definitions outside any VirtualHost
  -    section, is used when no match occurs.</p>
  +    section, is used when no IP-match occurs.  (But note that any IP
  +    address that matches a <a href="#namevirtualhost" class="directive"><code
class="directive">NameVirtualHost</code></a> directive will never use
  +    the "main" server config.  See the <a href="../vhosts/name-based.html">name-based
virtual hosting</a>
  +    documentation for further details.)</p>
   
       <p>You can specify a <code>:port</code> to change the port that is
       matched. If unspecified then it defaults to the same port as the
  
  
  

Mime
View raw message