httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Fri, 21 Nov 2003 23:38:23 GMT
nd          2003/11/21 15:38:23

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/filters Tag: APACHE_2_0_BRANCH mod_include.c
  Log:
  no longer allow an ETag header in 304 responses.
  
  PR: 19355
  Submitted by: Geoffrey Young <geoff apache.org>
  Reviewed by: Jeff Trawick, Thom May
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.182 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.181
  retrieving revision 1.988.2.182
  diff -u -u -r1.988.2.181 -r1.988.2.182
  --- CHANGES	20 Nov 2003 19:52:41 -0000	1.988.2.181
  +++ CHANGES	21 Nov 2003 23:38:21 -0000	1.988.2.182
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.49
   
  +  *) mod_include no longer allows an ETag header on 304 responses.
  +     PR 19355. [Geoffrey Young <geoff apache.org>, André Malo]
  +
     *) EBCDIC: Convert header fields to ASCII before sending (broken
        since 2.0.44). [Martin Kraemer]
   
  
  
  
  1.751.2.555 +0 -4      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.554
  retrieving revision 1.751.2.555
  diff -u -u -r1.751.2.554 -r1.751.2.555
  --- STATUS	21 Nov 2003 23:25:37 -0000	1.751.2.554
  +++ STATUS	21 Nov 2003 23:38:22 -0000	1.751.2.555
  @@ -343,10 +343,6 @@
           include/ap_mmn.h: r1.60
         +1: nd
   
  -    * mod_include: Don't allow ETag to be sent in 304. PR 19355.
  -        modules/filters/mod_include.c: r1.290
  -      +1: nd, trawick, thommay
  -
       * mod_autoindex: Restore the ability to add a description for
         directories that don't contain an index file.
         PR 7990
  
  
  
  No                   revision
  No                   revision
  1.232.2.5 +8 -3      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.232.2.4
  retrieving revision 1.232.2.5
  diff -u -u -r1.232.2.4 -r1.232.2.5
  --- mod_include.c	23 Oct 2003 20:07:46 -0000	1.232.2.4
  +++ mod_include.c	21 Nov 2003 23:38:23 -0000	1.232.2.5
  @@ -3335,7 +3335,13 @@
           || !(f->r->finfo.protection & APR_GEXECUTE)) {
           f->r->no_local_copy = 1;
       }
  -    
  +
  +    /* Don't allow ETag headers to be generated - see RFC2616 - 13.3.4.
  +     * We don't know if we are going to be including a file or executing
  +     * a program - in either case a strong ETag header will likely be invalid.
  +     */
  +     apr_table_setn(f->r->notes, "no-etag", "");
  +
       return OK;
   }
   
  @@ -3405,14 +3411,13 @@
        */
       apr_table_unset(f->r->headers_out, "Content-Length");
   
  -    /* Always unset the ETag/Last-Modified fields - see RFC2616 - 13.3.4.
  +    /* Always unset the Last-Modified field - see RFC2616 - 13.3.4.
        * We don't know if we are going to be including a file or executing
        * a program which may change the Last-Modified header or make the 
        * content completely dynamic.  Therefore, we can't support these
        * headers.
        * Exception: XBitHack full means we *should* set the Last-Modified field.
        */
  -    apr_table_unset(f->r->headers_out, "ETag");
   
       /* Assure the platform supports Group protections */
       if ((*conf->xbithack == xbithack_full)
  
  
  

Mime
View raw message