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 Sun, 02 Nov 2003 22:09:19 GMT
nd          2003/11/02 14:09:19

  Modified:    .        CHANGES
               modules/filters mod_include.c
  Log:
  no longer allow an ETag header in 304 responses.
  
  PR: 19355
  Submitted by: Geoffrey Young <geoff@apache.org>
  
  Revision  Changes    Path
  1.1309    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1308
  retrieving revision 1.1309
  diff -u -u -r1.1308 -r1.1309
  --- CHANGES	2 Nov 2003 20:37:03 -0000	1.1308
  +++ CHANGES	2 Nov 2003 22:09:19 -0000	1.1309
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_include no longer allows an ETag header on 304 responses.
  +     PR 19355. [Geoffrey Young <geoff@apache.org>, André Malo]
  +
     *) mod_autoindex: Add 'XHTML' option in order to allow switching between
        HTML 3.2 and XHTML 1.0 output. PR 23747.  [André Malo]
   
  
  
  
  1.290     +7 -2      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.289
  retrieving revision 1.290
  diff -u -u -r1.289 -r1.290
  --- mod_include.c	24 Oct 2003 16:20:27 -0000	1.289
  +++ mod_include.c	2 Nov 2003 22:09:19 -0000	1.290
  @@ -3580,6 +3580,12 @@
           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;
   }
   
  @@ -3657,14 +3663,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