mod_cache: RFC2616 14.9.3 The s-maxage directive also implies the

semantics of the proxy-revalidate directive.

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

diff --git a/CHANGES b/CHANGES
index bcb1792dfa1d59d41f423a79f0c49401309421b0..43817e9e583fe13509cd8a6c958fc2a5a636fca0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_cache: RFC2616 14.9.3 The s-maxage directive also implies the
+     semantics of the proxy-revalidate directive. [Graham Leggett]
+
   *) mod_cache: Make sure that contradictory entity headers present in a 304
      Not Modified response are caught and cause the entity to be removed.
      [Graham Leggett]

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index bf9f1a9d308c19094d7cbe989f38e47d62bc24c1..63378dfdc8e63165540ce7e84278708b9547f093 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1828,7 +1828,8 @@ static void cache_insert_error_filter(request_rec *r)
 
         if (cache->stale_handle && cache->save_filter
                 && !cache->stale_handle->cache_obj->info.control.must_revalidate
-                && !cache->stale_handle->cache_obj->info.control.proxy_revalidate) {
+                && !cache->stale_handle->cache_obj->info.control.proxy_revalidate
+                && !cache->stale_handle->cache_obj->info.control.s_maxage) {
             const char *warn_head;
             cache_server_conf
                     *conf =