httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1023388 - /httpd/httpd/trunk/modules/cache/mod_cache.c
Date Sat, 16 Oct 2010 23:24:09 GMT
Author: minfrin
Date: Sat Oct 16 23:24:09 2010
New Revision: 1023388

URL: http://svn.apache.org/viewvc?rev=1023388&view=rev
Log:
Fix the sense of the must_revalidate comparison. Replace a further call to
ap_cache_liststr() with a pre-parsed value.

Modified:
    httpd/httpd/trunk/modules/cache/mod_cache.c

Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=1023388&r1=1023387&r2=1023388&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Sat Oct 16 23:24:09 2010
@@ -797,7 +797,7 @@ static int cache_save_filter(ap_filter_t
         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(re
     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 =



Mime
View raw message