Received: by taz.hyperreal.com (8.7.5/V2.0) id TAA01012; Fri, 27 Sep 1996 19:01:07 -0700 (PDT) Received: by taz.hyperreal.com (8.7.5/V2.0) id TAA01004; Fri, 27 Sep 1996 19:01:05 -0700 (PDT) Date: Fri, 27 Sep 1996 19:01:05 -0700 (PDT) From: Brian Behlendorf Message-Id: <199609280201.TAA01004@taz.hyperreal.com> To: apache-cvs@hyperreal.com Subject: cvs commit: apache/src http_protocol.c Sender: owner-apache-cvs@apache.org Precedence: bulk Reply-To: new-httpd@hyperreal.com brian 96/09/27 19:01:05 Modified: src http_protocol.c Log: Reviewed by: Brian Behlendorf Submitted by: Tom Tromey, tromey@creche.cygnus.com Fixes oversight in setting last_modified date, brings into compliance with HTTP. Revision Changes Path 1.48 +2 -2 apache/src/http_protocol.c Index: http_protocol.c =================================================================== RCS file: /export/home/cvs/apache/src/http_protocol.c,v retrieving revision 1.47 retrieving revision 1.48 diff -C3 -r1.47 -r1.48 *** http_protocol.c 1996/09/24 12:44:57 1.47 --- http_protocol.c 1996/09/28 02:01:02 1.48 *************** *** 50,56 **** * */ ! /* $Id: http_protocol.c,v 1.47 1996/09/24 12:44:57 mjc Exp $ */ /* * http_protocol.c --- routines which directly communicate with the --- 50,56 ---- * */ ! /* $Id: http_protocol.c,v 1.48 1996/09/28 02:01:02 brian Exp $ */ /* * http_protocol.c --- routines which directly communicate with the *************** *** 331,337 **** /* Invalid, future time... just ignore it */ if (mtime > r->request_time) return OK; ! ts = gm_timestr_822(r->pool, mtime); table_set (r->headers_out, "Last-Modified", ts); /* Make an ETag header out of various peices of information. We use --- 331,337 ---- /* Invalid, future time... just ignore it */ if (mtime > r->request_time) return OK; ! ts = gm_timestr_822(r->pool, (mtime > r->request_time) ? r->request_time : mtime); table_set (r->headers_out, "Last-Modified", ts); /* Make an ETag header out of various peices of information. We use