From: wessels <>
Date: Mon, 12 Oct 1998 05:19:47 +0000 (+0000)
Subject: 2.0 branch merge
X-Git-Tag: SQUID_3_0_PRE1~2596
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=124511e5636ae8fc0c64d199f46f4965f8bab558;p=thirdparty%2Fsquid.git

2.0 branch merge
---

diff --git a/src/client_side.cc b/src/client_side.cc
index cdb2d87da1..985b543275 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.409 1998/10/09 17:52:56 wessels Exp $
+ * $Id: client_side.cc,v 1.410 1998/10/11 23:19:47 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -862,8 +862,6 @@ clientHierarchical(clientHttpRequest * http)
 	return 1;
     if (method != METHOD_GET)
 	return 0;
-    if (method != METHOD_CONNECT)
-	return 0;
     /* scan hierarchy_stoplist */
     for (p = Config.hierarchy_stoplist; p; p = p->next)
 	if (strstr(url, p->key))
diff --git a/src/peer_select.cc b/src/peer_select.cc
index 7bda5d61f5..ddb473fcd4 100644
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_select.cc,v 1.85 1998/09/19 17:06:08 wessels Exp $
+ * $Id: peer_select.cc,v 1.86 1998/10/11 23:19:48 wessels Exp $
  *
  * DEBUG: section 44    Peer Selection Algorithm
  * AUTHOR: Duane Wessels
@@ -304,6 +304,12 @@ peerSelectFoo(ps_state * psstate)
 	psstate->single_parent = p->in_addr;
 	debug(44, 3) ("peerSelect: found single parent, skipping ICP query\n");
     }
+    if (!request->flags.hierarchical && direct != DIRECT_NO) {
+	debug(44, 3) ("peerSelectFoo: DIRECT for non-hierarchical request\n");
+	hierarchyNote(&request->hier, DIRECT, &psstate->ping, request->host);
+	peerSelectCallback(psstate, NULL);
+	return;
+    }
 #if USE_CACHE_DIGESTS
     else if ((p = neighborsDigestSelect(request, entry))) {
 	debug(44, 2) ("peerSelect: Using Cache Digest\n");