look for 'no-cache' in subprocess_env to prevent the saving

of an otherwise cacheable response.

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

diff --git a/CHANGES b/CHANGES
index ea0c9661310d0a58a0cdb402a2b171e9f01f21aa..677d290bcbf54aff7f26316f9107d45c3f13cb71 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.1
 [ When backported to 2.2.x, remove entry from this file ]
 
+ *) mod_cache: Introduce 'no-cache' per-request environment variable
+    to prevent the saving of an otherwise cacheable response.
+    [Eric Covener]
+
  *) mod_rewrite: Introduce DiscardPathInfo|DPI flag to stop the troublesome
     way that per-directory rewrites append the previous notion of PATH_INFO
     to each substitution before evaluating subsequent rules. 

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index dce16fe457968b50466a9bfb6a6b4ebc4f25936a..b27c7fbb2ace3aaa766ef3a5244562a3c5afa54e 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -538,6 +538,9 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
                               "*", NULL)) {
         reason = "Vary header contains '*'";
     }
+    else if (apr_table_get(r->subprocess_env, "no-cache") != NULL) { 
+        reason = "environment variable 'no-cache' is set";
+    }
     else if (r->no_cache) {
         /* or we've been asked not to cache it above */
         reason = "r->no_cache present";