From: Graham Leggett <minfrin@apache.org>
Date: Sat, 16 Oct 2010 23:24:09 +0000 (+0000)
Subject: Fix the sense of the must_revalidate comparison. Replace a further call to
X-Git-Tag: 2.3.9~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c80d38ba8c66bbf5f7334034e7a7a2cee068dc60;p=thirdparty%2Fapache%2Fhttpd.git

Fix the sense of the must_revalidate comparison. Replace a further call to
ap_cache_liststr() with a pre-parsed value.


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

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index ae2915e244d..a34ffc8b446 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -797,7 +797,7 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
         ap_remove_output_filter(cache->remove_url_filter);
 
         if (cache->stale_handle
-                && cache->stale_handle->cache_obj->info.control.must_revalidate) {
+                && !cache->stale_handle->cache_obj->info.control.must_revalidate) {
             const char *warn_head;
 
             /* morph the current save filter into the out filter, and serve from
@@ -1600,9 +1600,8 @@ static void cache_insert_error_filter(request_rec *r)
     if (dummy) {
         cache_request_rec *cache = (cache_request_rec *) dummy;
 
-        if (cache->stale_handle && cache->save_filter && !ap_cache_liststr(
-                NULL, apr_table_get(cache->stale_handle->resp_hdrs,
-                        "Cache-Control"), "must-revalidate", NULL)) {
+        if (cache->stale_handle && cache->save_filter
+                && !cache->stale_handle->cache_obj->info.control.must_revalidate) {
             const char *warn_head;
             cache_server_conf
                     *conf =