------------------------------------------------------------
revno: 13524
revision-id: squid3@treenet.co.nz-20140802130128-kzs2ai9tuodyf9t9
parent: chtsanti@users.sourceforge.net-20140731140220-n7sev9ridj6epchp
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Sat 2014-08-02 06:01:28 -0700
message:
  Remove hierarchy_stoplist in favour of always_direct
  
  This directive was deprecated 2 years (and versions) ago. It can be
  replaced with:
    acl stoplist url_regex cgi-bin|\?
    always_direct allow stoplist
  
  The major difference between the two configurations is that the old
  hierarchy_stoplist was applied after never_direct and always_direct is
  applied before it. Both override the never_direct result, so this is not
  a problem.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140802130128-kzs2ai9tuodyf9t9
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: f8c9530c98c2c4be70569e5363f481559d5d5bf8
# timestamp: 2014-08-02 13:54:17 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: chtsanti@users.sourceforge.net-20140731140220-\
#   n7sev9ridj6epchp
# 
# Begin patch
=== modified file 'src/SquidConfig.h'
--- src/SquidConfig.h	2014-07-14 09:48:47 +0000
+++ src/SquidConfig.h	2014-08-02 13:01:28 +0000
@@ -243,7 +243,6 @@
     } Addrs;
     size_t tcpRcvBufsz;
     size_t udpMaxHitObjsz;
-    wordlist *hierarchy_stoplist;
     wordlist *mcast_group_list;
     wordlist *dns_nameservers;
     CachePeer *peers;

=== modified file 'src/cf.data.pre'
--- src/cf.data.pre	2014-07-30 15:31:10 +0000
+++ src/cf.data.pre	2014-08-02 13:01:28 +0000
@@ -169,6 +169,13 @@
 	This option is not yet supported by Squid-3.
 DOC_END
 
+# Options removed in 3.5
+NAME: hierarchy_stoplist
+TYPE: obsolete
+DOC_START
+	Remove this line. Use always_direct or cache_peer_access ACLs instead if you need to prevent cache_peer use.
+DOC_END
+
 # Options Removed in 3.3
 NAME: ignore_ims_on_miss
 TYPE: obsolete
@@ -3152,22 +3159,6 @@
 	possible forwarding paths be tried multiple times.
 DOC_END
 
-NAME: hierarchy_stoplist
-TYPE: wordlist
-DEFAULT: none
-LOC: Config.hierarchy_stoplist
-DOC_START
-	A list of words which, if found in a URL, cause the object to
-	be handled directly by this cache.  In other words, use this
-	to not query neighbor caches for certain objects.  You may
-	list this option multiple times.
-
-	Example:
-		hierarchy_stoplist cgi-bin ?
-
-	Note: never_direct overrides this option.
-DOC_END
-
 COMMENT_START
  MEMORY CACHE OPTIONS
  -----------------------------------------------------------------------------
@@ -7477,8 +7468,7 @@
 DEFAULT: on
 DOC_START
 	By default, Squid will send any non-hierarchical requests
-	(matching hierarchy_stoplist or not cacheable request type) direct
-	to origin servers.
+	(not cacheable request type) direct to origin servers.
 
 	When this is set to "off", Squid will prefer to send these
 	requests to parents.

=== modified file 'src/client_side_request.cc'
--- src/client_side_request.cc	2014-07-14 09:48:47 +0000
+++ src/client_side_request.cc	2014-08-02 13:01:28 +0000
@@ -945,10 +945,8 @@
 static int
 clientHierarchical(ClientHttpRequest * http)
 {
-    const char *url = http->uri;
     HttpRequest *request = http->request;
     HttpRequestMethod method = request->method;
-    const wordlist *p = NULL;
 
     // intercepted requests MUST NOT (yet) be sent to peers unless verified
     if (!request->flags.hostVerified && (request->flags.intercepted || request->flags.interceptTproxy))
@@ -975,11 +973,6 @@
     if (method != Http::METHOD_GET)
         return 0;
 
-    /* scan hierarchy_stoplist */
-    for (p = Config.hierarchy_stoplist; p; p = p->next)
-        if (strstr(url, p->key))
-            return 0;
-
     if (request->flags.loopDetected)
         return 0;