httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/http http_protocol.c
Date Mon, 07 Jul 2003 19:11:38 GMT
trawick     2003/07/07 12:11:37

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/http Tag: APACHE_2_0_BRANCH http_protocol.c
  Log:
  merge this fix from 2.1-dev:
  
    *) Don't respect the Server header field as set by modules and CGIs.
       As with 1.3, for proxy requests any such field is from the origin
       server; otherwise it will have our server info as controlled by
       the ServerTokens directive.  [Jeff Trawick]
  
  Reviewed by:	nd, jerenkrantz
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.122 +7 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.121
  retrieving revision 1.988.2.122
  diff -u -r1.988.2.121 -r1.988.2.122
  --- CHANGES	1 Jul 2003 01:25:04 -0000	1.988.2.121
  +++ CHANGES	7 Jul 2003 19:11:33 -0000	1.988.2.122
  @@ -1,3 +1,10 @@
  +Changes with Apache 2.0.48
  +
  +  *) Don't respect the Server header field as set by modules and CGIs.
  +     As with 1.3, for proxy requests any such field is from the origin 
  +     server; otherwise it will have our server info as controlled by
  +     the ServerTokens directive.  [Jeff Trawick]
  +
   Changes with Apache 2.0.47
   
     *) Prevent the server from crashing when entering infinite loops. The
  
  
  
  1.751.2.354 +1 -16     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.353
  retrieving revision 1.751.2.354
  diff -u -r1.751.2.353 -r1.751.2.354
  --- STATUS	5 Jul 2003 01:28:11 -0000	1.751.2.353
  +++ STATUS	7 Jul 2003 19:11:34 -0000	1.751.2.354
  @@ -197,21 +197,6 @@
           build/.cvsignore 1.4
           +1: trawick, jerenkrantz
   
  -    * Ignore the Server header field as set by modules and CGIs.
  -        modules/http/http_protocol.c 1.470
  -        jerenkrantz: When it is a proxy response that doesn't have server
  -                     string set, we shouldn't place one there.  Correct?
  -        trawick:     rfc2616/14.38: "The Server response-header field contains
  -                     information about the software used by the origin server 
  -                     to handle the request." ... "If the response is being 
  -                     forwarded through a proxy, the proxy application MUST NOT
  -                     modify the Server response-header."  
  -                     I don't see any wiggle room for us to be adding one if
  -                     the origin server didn't include it.
  -                     BTW, with my patch Apache 2 and Apache 1.3 will behave
  -                     identically.  (That's how I read the code, anyway :) )
  -        +1: trawick, nd, jerenkrantz
  -
       * mod_rewrite: Perform child initialization on the rewrite log
         lock.  This fixes a log corruption issue when flock-based 
         serialization is used (e.g., FreeBSD).
  
  
  
  No                   revision
  No                   revision
  1.463.2.4 +6 -3      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.463.2.3
  retrieving revision 1.463.2.4
  diff -u -r1.463.2.3 -r1.463.2.4
  --- http_protocol.c	17 Apr 2003 11:31:27 -0000	1.463.2.3
  +++ http_protocol.c	7 Jul 2003 19:11:36 -0000	1.463.2.4
  @@ -1279,10 +1279,13 @@
       h.bb = bb;
       form_header_field(&h, "Date", date);
   
  -    /* keep a previously set server header (possibly from proxy), otherwise
  +    /* keep the set-by-proxy server header, otherwise
        * generate a new server header */
  -    if ((server = apr_table_get(r->headers_out, "Server")) != NULL) {
  -        form_header_field(&h, "Server", server);
  +    if (r->proxyreq != PROXYREQ_NONE) {
  +        server = apr_table_get(r->headers_out, "Server");
  +        if (server) {
  +            form_header_field(&h, "Server", server);
  +        }
       }
       else {
           form_header_field(&h, "Server", ap_get_server_version());
  
  
  

Mime
View raw message