httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod core.xml core.html.en
Date Wed, 06 Nov 2002 01:55:15 GMT
jerenkrantz    2002/11/05 17:55:15

  Modified:    .        CHANGES
               server   core.c
               docs/manual/mod core.xml core.html.en
  Log:
  The value emitted by ServerSignature now mimics the Server HTTP header as
  controlled by ServerTokens.
  
  Submitted by:	Francis Daly <deva@daoine.org>
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.969     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.968
  retrieving revision 1.969
  diff -u -u -r1.968 -r1.969
  --- CHANGES	1 Nov 2002 08:35:19 -0000	1.968
  +++ CHANGES	6 Nov 2002 01:55:14 -0000	1.969
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.44
   
  +  *) The value emitted by ServerSignature now mimics the Server HTTP
  +     header as controlled by ServerTokens.  [Francis Daly <deva@daoine.org>]
  +
     *) Gracefully handly retry situations in the SSL input filter,
        by following the SSL libraries' retry semantics.
        [William Rowe]
  
  
  
  1.217     +3 -2      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.216
  retrieving revision 1.217
  diff -u -u -r1.216 -r1.217
  --- core.c	4 Nov 2002 15:15:09 -0000	1.216
  +++ core.c	6 Nov 2002 01:55:14 -0000	1.217
  @@ -2265,7 +2265,8 @@
       apr_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
   
       if (conf->server_signature == srv_sig_withmail) {
  -        return apr_pstrcat(r->pool, prefix, "<address>" AP_SERVER_BASEVERSION
  +        return apr_pstrcat(r->pool, prefix, "<address>", 
  +                           ap_get_server_version(),
                              " Server at <a href=\"mailto:",
                              r->server->server_admin, "\">",
                              ap_escape_html(r->pool, ap_get_server_name(r)),
  @@ -2273,7 +2274,7 @@
                              "</address>\n", NULL);
       }
   
  -    return apr_pstrcat(r->pool, prefix, "<address>" AP_SERVER_BASEVERSION
  +    return apr_pstrcat(r->pool, prefix, "<address>", ap_get_server_version(),
                          " Server at ",
                          ap_escape_html(r->pool, ap_get_server_name(r)),
                          " Port ", sport,
  
  
  
  1.41      +6 -0      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.40
  retrieving revision 1.41
  diff -u -u -r1.40 -r1.41
  --- core.xml	5 Nov 2002 08:14:34 -0000	1.40
  +++ core.xml	6 Nov 2002 01:55:15 -0000	1.41
  @@ -2509,6 +2509,9 @@
       "mailto:" reference to the <directive
       module="core">ServerAdmin</directive> of the referenced
       document.</p>
  +
  +    <p>After version 2.0.44, the details of the server version number
  +    presented are controlled by the ServerTokens directive.</p>
   </usage>
   <seealso><directive module="core">ServerTokens</directive></seealso>
   </directivesynopsis>
  @@ -2560,6 +2563,9 @@
   
       <p>This setting applies to the entire server, and cannot be
       enabled or disabled on a virtualhost-by-virtualhost basis.</p>
  +
  +    <p>After version 2.0.44, this directive also controls the
  +    information presented by the ServerSignature directive.</p>
   </usage>
   <seealso><directive module="core">ServerSignature</directive></seealso>
   </directivesynopsis>
  
  
  
  1.42      +6 -0      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.41
  retrieving revision 1.42
  diff -u -u -r1.41 -r1.42
  --- core.html.en	5 Nov 2002 08:14:34 -0000	1.41
  +++ core.html.en	6 Nov 2002 01:55:15 -0000	1.42
  @@ -2163,6 +2163,9 @@
       and the <code>EMail</code> setting additionally creates a
       "mailto:" reference to the <code class="directive"><a href="#serveradmin">ServerAdmin</a></code>
of the referenced
       document.</p>
  +
  +    <p>After version 2.0.44, the details of the server version number
  +    presented are controlled by the ServerTokens directive.</p>
   <h3>See also</h3><ul><li><code class="directive"><a href="#servertokens">ServerTokens</a></code></li></ul></div><div
class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div
class="directive-section"><h2><a name="ServerTokens" id="ServerTokens">ServerTokens</a>
<a name="servertokens" id="servertokens">Directive</a></h2><table class="directive"><tr><th><a
href="directive-dict.html#Description">Description: 
                 </a></th><td>Configures the Server HTTP response header</td></tr><tr><th><a
href="directive-dict.html#Syntax">Syntax:
                 </a></th><td><code>ServerTokens Major|Minor|Minimal|ProductOnly|OS|Full</code></td></tr><tr><th><a
href="directive-dict.html#Default">Default: 
  @@ -2209,6 +2212,9 @@
   
       <p>This setting applies to the entire server, and cannot be
       enabled or disabled on a virtualhost-by-virtualhost basis.</p>
  +
  +    <p>After version 2.0.44, this directive also controls the
  +    information presented by the ServerSignature directive.</p>
   <h3>See also</h3><ul><li><code class="directive"><a href="#serversignature">ServerSignature</a></code></li></ul></div><div
class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div
class="directive-section"><h2><a name="SetHandler" id="SetHandler">SetHandler</a>
<a name="sethandler" id="sethandler">Directive</a></h2><table class="directive"><tr><th><a
href="directive-dict.html#Description">Description: 
                 </a></th><td>Forces all matching files to be processed
by a
   handler</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
  
  
  

Mime
View raw message