From: Jim Jagielski <jim@apache.org>
Date: Thu, 23 May 2013 12:52:59 +0000 (+0000)
Subject: Merge r1479216 from trunk:
X-Git-Tag: 2.4.5~253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f647018b60ece90ba8f750df7f1c4b83cf00f6d;p=apache

Merge r1479216 from trunk:

mod_cache: RFC2616 14.9.3 The s-maxage directive also implies the
semantics of the proxy-revalidate directive.

Submitted by: minfrin
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1485670 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 112ff80f4e..f2b1a918a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_cache: RFC2616 14.9.3 The s-maxage directive also implies the
+     semantics of the proxy-revalidate directive. [Graham Leggett]
+
   *) mod_ssl: add support for subjectAltName-based host name checking
      in proxy mode. PR 54030. [Kaspar Brand]
 
diff --git a/STATUS b/STATUS
index fcf752a820..b030843444 100644
--- a/STATUS
+++ b/STATUS
@@ -90,12 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_cache: RFC2616 14.9.3 The s-maxage directive also implies the
-    semantics of the proxy-revalidate directive.
-    trunk patch: http://svn.apache.org/r1479216
-    2.4.x patch: trunk patch works (minus CHANGES)
-    +1: minfrin, covener, jim
-
     * mod_proxy: Reject invalid values for Max-Forwards.
       trunk patch: http://svn.apache.org/r1481302
                    http://svn.apache.org/r1481397
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 4f2d3e0468..46ac09f693 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1640,7 +1640,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 =