From: serassio <>
Date: Fri, 11 Mar 2005 03:22:46 +0000 (+0000)
Subject: Bug #1261: Peer digest fetch initiated even if peer not allowed to be
X-Git-Tag: SQUID_3_0_PRE4~853
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6755df2e7de94b62d3f1aa2eb9565b1450e5de32;p=thirdparty%2Fsquid.git

Bug #1261: Peer digest fetch initiated even if peer not allowed to be
used for the request

Forward patch of 2.5 patch.
---

diff --git a/src/neighbors.cc b/src/neighbors.cc
index ca876d8665..b0283a3d00 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.328 2005/01/06 03:22:22 robertc Exp $
+ * $Id: neighbors.cc,v 1.329 2005/03/10 20:22:46 serassio Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -793,6 +793,9 @@ peerDigestLookup(peer * p, HttpRequest * request)
     if (!p->digest) {
         debug(15, 5) ("peerDigestLookup: gone!\n");
         return LOOKUP_NONE;
+    } else if (!peerHTTPOkay(p, request)) {
+        debug(15, 5) ("peerDigestLookup: !peerHTTPOkay\n");
+        return LOOKUP_NONE;
     } else if (!p->digest->flags.needed) {
         debug(15, 5) ("peerDigestLookup: note need\n");
         peerDigestNeeded(p->digest);
@@ -801,9 +804,6 @@ peerDigestLookup(peer * p, HttpRequest * request)
         debug(15, 5) ("peerDigestLookup: !ready && %srequested\n",
                       p->digest->flags.requested ? "" : "!");
         return LOOKUP_NONE;
-    } else if (!peerHTTPOkay(p, request)) {
-        debug(15, 5) ("peerDigestLookup: !peerHTTPOkay\n");
-        return LOOKUP_NONE;
     }
 
     debug(15, 5) ("peerDigestLookup: OK to lookup peer %s\n", p->host);