From 35713c177fee916dbbb56fd8bcb1424ecdb47b79 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Thu, 17 May 2007 05:43:18 +0000 Subject: RFC 2616 13.2.1 calls out max-age as being a valid 'explicit expiration time', so per Sec. 13.9 permit queries with just max-age instead of only Expires. * modules/cache/mod_cache.c (cache_save_filter): Be closer to RFC 2616's intent for query arguments. * CHANGES: Update. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538807 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 36582fc45a..06902faf46 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.3.0 [Remove entries to the current 2.0 and 2.2 section below, when backported] + *) mod_cache: Allow caching of requests with query arguments when + Cache-Control max-age is explicitly specified. [Justin Erenkrantz] + *) mod_so: Solve dev's confusion by reporting expected/seen module magic signatures when failing with a 'garbled' message, and solve user's confusion by pointing out 'perhaps compiled for a different diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index 455b9594ff..a2f4f3ef45 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) { -- cgit v1.2.3