You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/05/23 14:52:59 UTC
svn commit: r1485670 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/cache/mod_cache.c
Author: jim
Date: Thu May 23 12:52:59 2013
New Revision: 1485670
URL: http://svn.apache.org/r1485670
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1479216
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1485670&r1=1485669&r2=1485670&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu May 23 12:52:59 2013
@@ -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]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1485670&r1=1485669&r2=1485670&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu May 23 12:52:59 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c?rev=1485670&r1=1485669&r2=1485670&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c Thu May 23 12:52:59 2013
@@ -1640,7 +1640,8 @@ static void cache_insert_error_filter(re
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 =