From c4afdce3fdb5087062c25e395da24f0b589a0350 Mon Sep 17 00:00:00 2001 From: Sander Striker Date: Wed, 9 Feb 2005 18:56:41 +0000 Subject: [PATCH] Some minimal tweaks to mod_cache. * modules/cache/mod_mem_cache.c (store_headers): Remove unused variable. * modules/cache/mod_cache.c (cache_save_filter): Slightly improve comment. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153104 13f79535-47bb-0310-9956-ffa450edef68 --- modules/cache/mod_cache.c | 5 +++-- modules/cache/mod_mem_cache.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index 494388d554..d8e25dd047 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -661,8 +661,9 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) r->status_line = NULL; /* RFC 2616 10.3.5 states that entity headers are not supposed - * to be in the 304 response. Therefore, we need to load in the - * cached headers before we update the cached headers. + * to be in the 304 response. Therefore, we need to combine the + * response headers with the cached headers *before* we update + * the cached headers. * * However, before doing that, we need to first merge in * err_headers_out and we also need to strip any hop-by-hop diff --git a/modules/cache/mod_mem_cache.c b/modules/cache/mod_mem_cache.c index 1eccd9c25d..b5ddead953 100644 --- a/modules/cache/mod_mem_cache.c +++ b/modules/cache/mod_mem_cache.c @@ -670,7 +670,7 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info cache_object_t *obj = h->cache_obj; mem_cache_object_t *mobj = (mem_cache_object_t*) obj->vobj; int rc; - apr_table_t *headers_out, *err_headers_out; + apr_table_t *headers_out; /* * The cache needs to keep track of the following information: -- 2.50.1