Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 9132 invoked by uid 500); 14 Sep 2002 04:51:57 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 9121 invoked by uid 500); 14 Sep 2002 04:51:57 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 14 Sep 2002 04:51:56 -0000 Message-ID: <20020914045156.35220.qmail@icarus.apache.org> From: brianp@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0 CHANGES X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N brianp 2002/09/13 21:51:56 Modified: modules/experimental mod_disk_cache.c . CHANGES Log: Remove the setting of the status line from the cache in mod_disk_cache, because this was causing 200s to be sent on responses that were really 304s Submitted by: Kris Verbeeck Reviewed by: Brian Pane Revision Changes Path 1.39 +4 -6 httpd-2.0/modules/experimental/mod_disk_cache.c Index: mod_disk_cache.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- mod_disk_cache.c 18 Aug 2002 12:33:05 -0000 1.38 +++ mod_disk_cache.c 14 Sep 2002 04:51:55 -0000 1.39 @@ -484,16 +484,14 @@ r->status = atoi(urlbuff); /* Save status line into request rec */ - rv = apr_file_gets(&urlbuff[0], urllen, dobj->hfd); /* Read status line */ + /* Read and ignore the status line (This request might result in a + * 304, so we don't necessarily want to retransmit a 200 from the cache.) + */ + rv = apr_file_gets(&urlbuff[0], urllen, dobj->hfd); if (rv != APR_SUCCESS) { /* XXX log message */ return rv; } - - if ((temp = strchr(&urlbuff[0], '\n')) != NULL) /* trim off new line character */ - *temp = '\0'; /* overlay it with the null terminator */ - - r->status_line = apr_pstrdup(r->pool, urlbuff); /* Save status line into request rec */ h->req_hdrs = apr_table_make(r->pool, 20); 1.925 +5 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.924 retrieving revision 1.925 diff -u -r1.924 -r1.925 --- CHANGES 12 Sep 2002 20:04:06 -0000 1.924 +++ CHANGES 14 Sep 2002 04:51:55 -0000 1.925 @@ -1,3 +1,8 @@ +Changes with Apache 2.0.42 + + *) Fixed mod_disk_cache's generation of 304s + [Kris Verbeeck ] + Changes with Apache 2.0.41 *) Add support for using fnmatch patterns in the final path