Commit 7210bf37 authored by Sander Striker's avatar Sander Striker
Browse files

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
parent 7946063f

modules/cache/mod_cache.c

+3 −2
Changes for modules/cache/mod_cache.c: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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

modules/cache/mod_mem_cache.c

+1 −1
Changes for modules/cache/mod_mem_cache.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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: