You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by re...@apache.org on 2003/09/12 21:28:47 UTC
cvs commit: httpd-2.0/modules/experimental mod_cache.c
rederpj 2003/09/12 12:28:47
Modified: . CHANGES
modules/experimental mod_cache.c
Log:
This fixes the cache code so that responses can be cached if they have
an Expires header but no Etag or Last-Modified headers. PR 23130.
Submitted by: <bj...@exoweb.net>
Reviewed by: Paul J. Reder
Revision Changes Path
1.1272 +6 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1271
retrieving revision 1.1272
diff -u -r1.1271 -r1.1272
--- CHANGES 11 Sep 2003 18:24:25 -0000 1.1271
+++ CHANGES 12 Sep 2003 19:28:46 -0000 1.1272
@@ -2,6 +2,12 @@
[Remove entries to the current 2.0 section below, when backported]
+ *) This fixes the cache code so that responses can be cached
+ if they have an Expires header but no Etag or Last-Modified
+ headers. PR 23130.
+ [Submitted by: <bj...@exoweb.net>]
+ [Reviewed by: Paul J. Reder]
+
*) Fix a couple of AIX xlc_r compiler issues in the code I just
committed. [Paul J. Reder]
1.77 +5 -6 httpd-2.0/modules/experimental/mod_cache.c
Index: mod_cache.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_cache.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- mod_cache.c 11 Sep 2003 18:24:26 -0000 1.76
+++ mod_cache.c 12 Sep 2003 19:28:47 -0000 1.77
@@ -565,14 +565,14 @@
reason = "HTTP Status 304 Not Modified";
}
else if (r->status == HTTP_OK && lastmods == NULL && etag == NULL
- && (conf->no_last_mod_ignore ==0)) {
- /* 200 OK response from HTTP/1.0 and up without a Last-Modified
- * header/Etag
+ && (exps == NULL) && (conf->no_last_mod_ignore ==0)) {
+ /* 200 OK response from HTTP/1.0 and up without Last-Modified,
+ * Etag, or Expires headers.
*/
- /* XXX mod-include clears last_modified/expires/etags - this
+ /* Note: mod-include clears last_modified/expires/etags - this
* is why we have an optional function for a key-gen ;-)
*/
- reason = "No Last-Modified or Etag header";
+ reason = "No Last-Modified, Etag, or Expires headers";
}
else if (r->header_only) {
/* HEAD requests */
@@ -760,7 +760,6 @@
info->request_time = r->request_time;
/* check last-modified date */
- /* XXX FIXME we're referencing date on a path where we didn't set it */
if (lastmod != APR_DATE_BAD && lastmod > date) {
/* if it's in the future, then replace by date */
lastmod = date;
Re: cvs commit: httpd-2.0/modules/experimental mod_cache.c
Posted by Jeff Trawick <tr...@attglobal.net>.
rederpj@apache.org wrote:
> rederpj 2003/09/12 12:28:47
>
> Modified: . CHANGES
> modules/experimental mod_cache.c
> Log:
> This fixes the cache code so that responses can be cached if they have
> an Expires header but no Etag or Last-Modified headers. PR 23130.
> Submitted by: <bj...@exoweb.net>
> Reviewed by: Paul J. Reder
> Index: CHANGES
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/CHANGES,v
> retrieving revision 1.1271
> retrieving revision 1.1272
> diff -u -r1.1271 -r1.1272
> --- CHANGES 11 Sep 2003 18:24:25 -0000 1.1271
> +++ CHANGES 12 Sep 2003 19:28:46 -0000 1.1272
> @@ -2,6 +2,12 @@
>
> [Remove entries to the current 2.0 section below, when backported]
>
> + *) This fixes the cache code so that responses can be cached
> + if they have an Expires header but no Etag or Last-Modified
> + headers. PR 23130.
> + [Submitted by: <bj...@exoweb.net>]
> + [Reviewed by: Paul J. Reder]
This should be
*) This fixes the cache code so that responses can be cached
if they have an Expires header but no Etag or Last-Modified
headers. PR 23130. [<bj...@exoweb.net>]
unless you had to modify the code, in which case your name goes inside
[] along with the other person's info with no distinguishing between the
submitter and the reviewer. Also, it is nice to see a real name when known.
Re: cvs commit: httpd-2.0/modules/experimental mod_cache.c
Posted by Jeff Trawick <tr...@attglobal.net>.
rederpj@apache.org wrote:
> rederpj 2003/09/12 12:28:47
>
> Modified: . CHANGES
> modules/experimental mod_cache.c
> Log:
> This fixes the cache code so that responses can be cached if they have
> an Expires header but no Etag or Last-Modified headers. PR 23130.
> Submitted by: <bj...@exoweb.net>
> Reviewed by: Paul J. Reder
> Index: CHANGES
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/CHANGES,v
> retrieving revision 1.1271
> retrieving revision 1.1272
> diff -u -r1.1271 -r1.1272
> --- CHANGES 11 Sep 2003 18:24:25 -0000 1.1271
> +++ CHANGES 12 Sep 2003 19:28:46 -0000 1.1272
> @@ -2,6 +2,12 @@
>
> [Remove entries to the current 2.0 section below, when backported]
>
> + *) This fixes the cache code so that responses can be cached
> + if they have an Expires header but no Etag or Last-Modified
> + headers. PR 23130.
> + [Submitted by: <bj...@exoweb.net>]
> + [Reviewed by: Paul J. Reder]
This should be
*) This fixes the cache code so that responses can be cached
if they have an Expires header but no Etag or Last-Modified
headers. PR 23130. [<bj...@exoweb.net>]
unless you had to modify the code, in which case your name goes inside
[] along with the other person's info with no distinguishing between the
submitter and the reviewer. Also, it is nice to see a real name when known.