From 4d2b3c1a7dcc2bc5435409d413f5954f4132ad0c Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sat, 4 May 2013 23:03:13 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ modules/cache/mod_cache.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index bcb1792dfa..43817e9e58 100644 --- 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 bf9f1a9d30..63378dfdc8 100644 --- 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 = -- 2.40.0