------------------------------------------------------------
revno: 11690
revision-id: squid3@treenet.co.nz-20121020123221-oa4q7z1dau5lv6ey
parent: squid3@treenet.co.nz-20121020100711-i6ch82t81817bkso
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Sat 2012-10-20 06:32:21 -0600
message:
  Remove the refresh_pattern ignore-no-cache option
  
  With the HTTP/1.1 Cache-Control:no-cache compliance upgrade this option became
  obsolete. Its main use-case was to force caching of responses which contained this
  control. Revalidation is now happening and no-cache objects are cached by default.
  
  The one remaining effect of ignoring no-cache is to prevent no-cache from allowing
  authenticated responses being cached. Which is the opposite of its usually expected
  result and allowing that change of behaviour would be counter productive.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121020123221-oa4q7z1dau5lv6ey
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: 546b628ee26a5afed2c0a5c4d97d3312c22c1d0c
# timestamp: 2012-10-31 23:03:00 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20121020100711-\
#   i6ch82t81817bkso
# 
# Begin patch
=== modified file 'src/cache_cf.cc'
--- src/cache_cf.cc	2012-10-17 00:39:25 +0000
+++ src/cache_cf.cc	2012-10-20 12:32:21 +0000
@@ -754,15 +754,6 @@
         }
 
         for (R = Config.Refresh; R; R = R->next) {
-            if (!R->flags.ignore_no_cache)
-                continue;
-
-            debugs(22, 1, "WARNING: use of 'ignore-no-cache' in 'refresh_pattern' violates HTTP");
-
-            break;
-        }
-
-        for (R = Config.Refresh; R; R = R->next) {
             if (!R->flags.ignore_no_store)
                 continue;
 
@@ -2640,9 +2631,6 @@
         if (head->flags.ignore_reload)
             storeAppendPrintf(entry, " ignore-reload");
 
-        if (head->flags.ignore_no_cache)
-            storeAppendPrintf(entry, " ignore-no-cache");
-
         if (head->flags.ignore_no_store)
             storeAppendPrintf(entry, " ignore-no-store");
 
@@ -2681,7 +2669,6 @@
     int override_lastmod = 0;
     int reload_into_ims = 0;
     int ignore_reload = 0;
-    int ignore_no_cache = 0;
     int ignore_no_store = 0;
     int ignore_must_revalidate = 0;
     int ignore_private = 0;
@@ -2760,8 +2747,6 @@
             override_expire = 1;
         else if (!strcmp(token, "override-lastmod"))
             override_lastmod = 1;
-        else if (!strcmp(token, "ignore-no-cache"))
-            ignore_no_cache = 1;
         else if (!strcmp(token, "ignore-no-store"))
             ignore_no_store = 1;
         else if (!strcmp(token, "ignore-must-revalidate"))
@@ -2780,6 +2765,8 @@
             /* tell client_side.c that this is used */
 #endif
 
+        } else if (!strcmp(token, "ignore-no-cache")) {
+            debugs(22, DBG_PARSE_NOTE(2), "UPGRADE: refresh_pattern option 'ignore-no-cache' is obsolete. Remove it.");
         } else
             debugs(22, 0, "refreshAddToList: Unknown option '" << pattern << "': " << token);
     }
@@ -2826,9 +2813,6 @@
     if (ignore_reload)
         t->flags.ignore_reload = 1;
 
-    if (ignore_no_cache)
-        t->flags.ignore_no_cache = 1;
-
     if (ignore_no_store)
         t->flags.ignore_no_store = 1;
 

=== modified file 'src/cf.data.pre'
--- src/cf.data.pre	2012-09-23 09:20:43 +0000
+++ src/cf.data.pre	2012-10-20 12:32:21 +0000
@@ -3943,7 +3943,6 @@
 		 override-lastmod
 		 reload-into-ims
 		 ignore-reload
-		 ignore-no-cache
 		 ignore-no-store
 		 ignore-must-revalidate
 		 ignore-private
@@ -3976,12 +3975,6 @@
 		this feature could make you liable for problems which
 		it causes.
 
-		ignore-no-cache ignores any ``Pragma: no-cache'' and
-		``Cache-control: no-cache'' headers received from a server.
-		The HTTP RFC never allows the use of this (Pragma) header
-		from a server, only a client, though plenty of servers
-		send it anyway.
-
 		ignore-no-store ignores any ``Cache-control: no-store''
 		headers received from a server. Doing this VIOLATES
 		the HTTP standard. Enabling this feature could make you

=== modified file 'src/http.cc'
--- src/http.cc	2012-10-20 10:07:11 +0000
+++ src/http.cc	2012-10-20 12:32:21 +0000
@@ -408,7 +408,7 @@
 
 #if 0 // waiting on HTTPbis WG agreement before we do this
             // NP: given the must-revalidate exception we should also be able to exempt no-cache.
-        } else if (rep->cache_control->noCache() && !REFRESH_OVERRIDE(ignore_no_cache)) {
+        } else if (rep->cache_control->noCache()) {
             debugs(22, 3, HERE << "Authenticated but server reply Cache-Control:no-cache");
             mayStore = true;
 #endif

=== modified file 'src/structs.h'
--- src/structs.h	2012-07-13 11:53:18 +0000
+++ src/structs.h	2012-10-20 12:32:21 +0000
@@ -1053,7 +1053,6 @@
         unsigned int override_lastmod:1;
         unsigned int reload_into_ims:1;
         unsigned int ignore_reload:1;
-        unsigned int ignore_no_cache:1;
         unsigned int ignore_no_store:1;
         unsigned int ignore_must_revalidate:1;
         unsigned int ignore_private:1;