cvs commit: apache-1.2/src CHANGES mod_include.c

[dgaudet]

dgaudet     98/02/03 02:00:52

  Modified:    src      CHANGES mod_include.c
  Log:
  mod_include when using XBitHack Full would send ETags in addition to
  sending Last-Modifieds.  This is incorrect HTTP/1.1 behaviour.
  
  PR:           1133
  
  Revision  Changes    Path
  1.292     +5 -1      apache-1.2/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
  retrieving revision 1.291
  retrieving revision 1.292
  diff -u -r1.291 -r1.292
  --- CHANGES   1998/02/03 09:53:48     1.291
  +++ CHANGES   1998/02/03 10:00:47     1.292
  @@ -1,5 +1,9 @@
   Changes with Apache 1.2.6
  -  
  +
  +  *) mod_include when using XBitHack Full would send ETags in addition to
  +     sending Last-Modifieds.  This is incorrect HTTP/1.1 behaviour.
  +     [Dean Gaudet] PR#1133
  +
     *) SECURITY: When a client connects to a particular port/addr, and
        gives a Host: header ensure that the virtual host requested can
        actually be reached via that port/addr.  [Ed Korthof <[EMAIL 
PROTECTED]>]
  
  
  
  1.36      +7 -2      apache-1.2/src/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_include.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- mod_include.c     1998/02/01 02:33:38     1.35
  +++ mod_include.c     1998/02/03 10:00:49     1.36
  @@ -2227,8 +2227,13 @@
       /*  OS/2 dosen't support Groups. */
        && (r->finfo.st_mode & S_IXGRP)
   #endif
  -     && (errstatus = set_last_modified (r, r->finfo.st_mtime)))
  -        return errstatus;
  +     ) {
  +     errstatus = set_last_modified (r, r->finfo.st_mtime);
  +     table_unset(r->headers_out, "ETag");
  +     if (errstatus) {
  +         return errstatus;
  +     }
  +    }
   
       send_http_header(r);