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/modules/filters mod_include.c
Date Wed, 19 Sep 2001 06:20:32 GMT
jerenkrantz    01/09/18 23:20:32

  Modified:    .        CHANGES
               modules/filters mod_include.c
  Log:
  Fix case where an included file may change but the shtml file has not -
  since we returned Last-Modified/ETag headers, we said that it was possibly
  cacheable.  Wrong.
  
  See RFC 2616 13.3.4 for more details (these are SHOULD/MAY clauses, so I
  think we can discard them when we are dealing with dynamic data).
  
  (Justin cleaned up the comment to cite RFC 2616.)
  
  Submitted by:	Ian Holsman <ianh@cnet.com>
  Reviewed by:	Justin Erenkrantz, Aaron Bannert, Brian Pane
  
  Revision  Changes    Path
  1.366     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.365
  retrieving revision 1.366
  diff -u -r1.365 -r1.366
  --- CHANGES	2001/09/19 05:58:08	1.365
  +++ CHANGES	2001/09/19 06:20:32	1.366
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.26-dev
   
  +  *) Fix mod_include to not return ETag or Last-Modified headers.
  +     [Ian Holsman <ianh@cnet.com>]
  +
     *) Fix worker MPM's scoreboard logic.  [Aaron Bannert <aaron@clove.org>]
   
     *) Eliminate the wasteful run-time conversion of method names from strings 
  
  
  
  1.149     +8 -0      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.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- mod_include.c	2001/09/17 02:53:01	1.148
  +++ mod_include.c	2001/09/19 06:20:32	1.149
  @@ -3082,6 +3082,14 @@
        */
       apr_table_unset(f->r->headers_out, "Content-Length");
   
  +    /* Always unset the ETag/Last-Modified fields - see RFC2616 - 13.3.4.
  +     * We don't know if we are going to be include a virtual file (think
  +     * exec) which may make the content completely dynamic or change the
  +     * Last-Modified header.  Therefore, we can't support these headers.
  +     */
  +    apr_table_unset(f->r->headers_out, "ETag");
  +    apr_table_unset(f->r->headers_out, "Last-Modified");
  +
       rv = send_parsed_content(&b, r, f);
   
       if (parent) {
  
  
  

Mime
View raw message