Return-Path: 
 <cvs-return-12405-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 43855 invoked by uid 500); 5 Jul 2002 03:28:08 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 43844 invoked by uid 500); 5 Jul 2002 03:28:08 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Date: 5 Jul 2002 03:28:06 -0000
Message-ID: <20020705032806.1078.qmail@icarus.apache.org>
From: rbowen@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/docs/manual/mod core.html.en core.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

rbowen      2002/07/04 20:28:06

  Modified:    docs/manual/mod core.html.en core.xml
  Log:
  Submitted by: Owen Boyle, on users@ mailing list
  Additional clarification on UseCanonicalName directive.
  
  Revision  Changes    Path
  1.11      +17 -9     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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- core.html.en	15 Jun 2002 02:48:16 -0000	1.10
  +++ core.html.en	5 Jul 2002 03:28:05 -0000	1.11
  @@ -1684,20 +1684,27 @@
       <p>In many situations Apache has to construct a
       <em>self-referential</em> URL. That is, a URL which refers back to
       the same server. With <code>UseCanonicalName on</code> Apache will
  -    use the hostname and port specified in the <a href="#servername" class="directive"><code class="directive">ServerName</code></a> directive to construct a canonical
  +    use the hostname and port specified in the <a href="#servername" class="directive"><code class="directive">ServerName</code></a> directive to construct the canonical
       name for the server. This name is used in all self-referential
       URLs, and for the values of <code>SERVER_NAME</code> and
       <code>SERVER_PORT</code> in CGIs.</p>
   
  +    <p>For example, if <code class="directive">ServerName</code> is set to
  +    <code>www.example.com</code> and <code class="directive">Port</code> is set
  +    to <code>9090</code>, then the <em>canonical name</em> of the server
  +    is <code>www.example.com:9090</code>. In the event that
  +    <code class="directive">Port</code> has its default value of
  +    <code>80</code>, the <code>:80</code> is ommitted from the
  +    <em>canonical name</em>.</p>
  +
       <p>With <code>UseCanonicalName off</code> Apache will form
       self-referential URLs using the hostname and port supplied by
       the client if any are supplied (otherwise it will use the
  -    canonical name). These values are the same that are used to
  -    implement <a href="../vhosts/name-based.html">name based
  -    virtual hosts</a>, and are available with the same clients. The
  -    CGI variables <code>SERVER_NAME</code> and
  -    <code>SERVER_PORT</code> will be constructed from the client
  -    supplied values as well.</p>
  +    canonical name, as defined above). These values are the same
  +    that are used to implement <a href="../vhosts/name-based.html">name based virtual hosts</a>,
  +    and are available with the same clients. The CGI variables 
  +    <code>SERVER_NAME</code> and <code>SERVER_PORT</code> will be
  +    constructed from the client supplied values as well.</p>
   
       <p>An example where this may be useful is on an intranet server
       where you have users connecting to the machine using short
  @@ -1707,8 +1714,9 @@
       slash</em> then Apache will redirect them to
       <code>http://www.domain.com/splat/</code>. If you have
       authentication enabled, this will cause the user to have to
  -    reauthenticate twice (once for <code>www</code> and once again
  -    for <code>www.domain.com</code>). But if
  +    authenticate twice (once for <code>www</code> and once again
  +    for <code>www.domain.com</code> -- see <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">the
  +    FAQ on this subject for more information</a>). But if
       <code class="directive">UseCanonicalName</code> is set off, then Apache will
       redirect to <code>http://www/splat/</code>.</p>
   
  
  
  
  1.18      +19 -9     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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- core.xml	15 Jun 2002 02:48:16 -0000	1.17
  +++ core.xml	5 Jul 2002 03:28:06 -0000	1.18
  @@ -2441,20 +2441,28 @@
       <em>self-referential</em> URL. That is, a URL which refers back to
       the same server. With <code>UseCanonicalName on</code> Apache will
       use the hostname and port specified in the <directive
  -    module="core">ServerName</directive> directive to construct a canonical
  +    module="core">ServerName</directive> directive to construct the canonical
       name for the server. This name is used in all self-referential
       URLs, and for the values of <code>SERVER_NAME</code> and
       <code>SERVER_PORT</code> in CGIs.</p>
   
  +    <p>For example, if <directive>ServerName</directive> is set to
  +    <code>www.example.com</code> and <directive>Port</directive> is set
  +    to <code>9090</code>, then the <em>canonical name</em> of the server
  +    is <code>www.example.com:9090</code>. In the event that
  +    <directive>Port</directive> has its default value of
  +    <code>80</code>, the <code>:80</code> is ommitted from the
  +    <em>canonical name</em>.</p>
  +
       <p>With <code>UseCanonicalName off</code> Apache will form
       self-referential URLs using the hostname and port supplied by
       the client if any are supplied (otherwise it will use the
  -    canonical name). These values are the same that are used to
  -    implement <a href="../vhosts/name-based.html">name based
  -    virtual hosts</a>, and are available with the same clients. The
  -    CGI variables <code>SERVER_NAME</code> and
  -    <code>SERVER_PORT</code> will be constructed from the client
  -    supplied values as well.</p>
  +    canonical name, as defined above). These values are the same
  +    that are used to implement <a 
  +    href="../vhosts/name-based.html">name based virtual hosts</a>,
  +    and are available with the same clients. The CGI variables 
  +    <code>SERVER_NAME</code> and <code>SERVER_PORT</code> will be
  +    constructed from the client supplied values as well.</p>
   
       <p>An example where this may be useful is on an intranet server
       where you have users connecting to the machine using short
  @@ -2464,8 +2472,10 @@
       slash</em> then Apache will redirect them to
       <code>http://www.domain.com/splat/</code>. If you have
       authentication enabled, this will cause the user to have to
  -    reauthenticate twice (once for <code>www</code> and once again
  -    for <code>www.domain.com</code>). But if
  +    authenticate twice (once for <code>www</code> and once again
  +    for <code>www.domain.com</code> -- see <a
  +    href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">the
  +    FAQ on this subject for more information</a>). But if
       <directive>UseCanonicalName</directive> is set off, then Apache will
       redirect to <code>http://www/splat/</code>.</p>