httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_negotiation.c
Date Mon, 06 Aug 2001 19:13:03 GMT
wrowe       01/08/06 12:13:03

  Modified:    modules/http http_request.c
               modules/mappers mod_negotiation.c
  Log:
    Remove the ->mtime reset back to negotiation, who decided to do this.
  
  Revision  Changes    Path
  1.105     +1 -1      httpd-2.0/modules/http/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- http_request.c	2001/08/06 19:10:12	1.104
  +++ http_request.c	2001/08/06 19:13:02	1.105
  @@ -565,7 +565,7 @@
        * rr->pool.
        */
       apr_pool_join(r->pool, rr->pool);
  -    r->mtime = rr->mtime; /* reset etag info for subrequest */
  +    r->mtime = rr->mtime;
       r->uri = rr->uri;
       r->args = rr->args;
       r->filename = rr->filename;
  
  
  
  1.68      +6 -0      httpd-2.0/modules/mappers/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- mod_negotiation.c	2001/08/06 19:09:08	1.67
  +++ mod_negotiation.c	2001/08/06 19:13:02	1.68
  @@ -2703,6 +2703,12 @@
       /* now do a "fast redirect" ... promotes the sub_req into the main req */
       ap_internal_fast_redirect(sub_req, r);
   
  +    /* give no advise for time on this subrequest.  Perhaps we
  +     * should tally the last mtime amoung all variants, and date
  +     * the most recent, but that could confuse the proxies.
  +     */
  +    r->mtime = 0;
  +    
       /* clean up all but our favorite variant, since that sub_req
        * is now merged into the main request!
        */
  
  
  

Mime
View raw message