2.0 branch merge

diff --git a/src/client_side.cc b/src/client_side.cc
index cdb2d87da174f5319bc8f9c8c31a26080027f057..985b543275d8f87999a387968dada210d50f6e9c 100644 (file)
--- 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 7bda5d61f515a998096c1679cf335ee01fd32382..ddb473fcd40834252cabb7c823d4aa62490fcee0 100644 (file)
--- 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");