Commit e11e463e authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

mod_cache: Allow caching of requests with query arguments when Cache-Control 

max-age is explicitly specified.

(Backport of r538807)

Reviewed by: jerenkrantz, fielding, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539280 13f79535-47bb-0310-9956-ffa450edef68
parent 81b95d64

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.5













  *) mod_cache: Allow caching of requests with query arguments when













     Cache-Control max-age is explicitly specified.  [Justin Erenkrantz]



























  *) mod_disk_cache: Allow Vary'd responses to be refreshed properly.















     [Justin Erenkrantz]















































modules/cache/mod_cache.c



+5
−4






























Original line number
Diff line number
Diff line








@@ -452,11 +452,12 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)













        /* if a Expires header is in the past, don't cache it */















        reason = "Expires header already expired, not cacheable";















    }













    else if (!conf->ignorequerystring && r->parsed_uri.query && exps == NULL) {













        /* if query string present but no expiration time, don't cache it













         * (RFC 2616/13.9)













    else if (!conf->ignorequerystring && r->parsed_uri.query && exps == NULL &&













             !ap_cache_liststr(NULL, cc_out, "max-age", NULL)) {













        /* if a query string is present but no explicit expiration time,













         * don't cache it (RFC 2616/13.9 & 13.2.1)















         */













        reason = "Query string present but no expires header";













        reason = "Query string present but no explicit expiration time";















    }















    else if (r->status == HTTP_NOT_MODIFIED &&















             !cache->handle && !cache->stale_handle) {