Do not cache responses to GET requests with query

URLs if the origin server does not explicitly provide an
Expires header on the response (RFC 2616 Section 13.9)

Submitted by:	Kris Verbeeck <krisv@be.ubizen.com>
Reviewed by:	Bill Stoddard

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96772 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index be428d831ea49ca013dc0f39b62f3419753e54ef..cf6158d4651fa13ca019abf5ac6e7c3984dda7d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.41
+  *) mod_cache: Do not cache responses to GET requests with query
+     URLs if the origin server does not explicitly provide an
+     Expires header on the response (RFC 2616 Section 13.9)
+     [Kris Verbeeck krisv@be.ubizen.com]
 
   *) Fix memory leak in core_output_filter.  [Justin Erenkrantz]
 

diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index e693508464faba8a1e30a86437bc2e173aabfd35..fcbb6676e26aeeb2e00a8590c23a8496794c1de0 100644 (file)
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -538,6 +538,10 @@ static int cache_in_filter(ap_filter_t *f, apr_bucket_brigade *in)
              && r->status != HTTP_NOT_MODIFIED)
             /* if a broken Expires header is present, don't cache it */
             || (exps != NULL && exp == APR_DATE_BAD)
+            /* if query string present but no expiration time, don't cache it
+             * (RFC 2616/13.9)
+             */
+            || (r->args && exps == NULL)
             /* if the server said 304 Not Modified but we have no cache
              * file - pass this untouched to the user agent, it's not for us.
              */