From 4f100a47d31e33c3bc8a16d90a5273f2e86d5a79 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Fri, 18 May 2007 06:12:24 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ modules/cache/mod_cache.c | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index eae49514480..41643a1f86b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- 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] diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index 9646b964dad..e83eba80f46 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -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) { -- 2.47.2