hno squid-2.2.DEVEL3.netdb_and_never_direct.patch

Squid-2.2.DEVEL3: Don't allow netdb selection to bypass never_direct

Netdb selection could bypass never_direct and cause Squid to go direct
to an origin site even if never_direct allow was in effect.

diff --git a/src/peer_select.cc b/src/peer_select.cc
index 3bd6233c72083a0d42820985f3abcd70b73b7870..10a3391b6ec293653e59fc930cfdabe2454259c7 100644 (file)
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_select.cc,v 1.107 2000/05/02 18:35:09 hno Exp $
+ * $Id: peer_select.cc,v 1.108 2000/05/02 18:37:59 hno Exp $
  *
  * DEBUG: section 44    Peer Selection Algorithm
  * AUTHOR: Duane Wessels
@@ -210,6 +210,8 @@ peerCheckNetdbDirect(ps_state * psstate)
     int myhops;
     if (p == NULL)
        return 0;
+    if (psstate->direct == DIRECT_NO)
+       return 0;
     myrtt = netdbHostRtt(psstate->request->host);
     debug(44, 3) ("peerCheckNetdbDirect: MY RTT = %d msec\n", myrtt);
     debug(44, 3) ("peerCheckNetdbDirect: closest_parent_miss RTT = %d msec\n",