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

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 494388d554cce6001b22406093e339c7c419318d..d8e25dd0476fe996c9e1ff249de198846a71f59a 100644 (file)
--- 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 1eccd9c25db5f22b047c04b53409d78f20df515c..b5ddead9537802be14303858cb4b138a6d8dec17 100644 (file)
--- 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: