From: amosjeffries <>
Date: Mon, 17 Dec 2007 05:45:09 +0000 (+0000)
Subject: ICAP fixes mk2.
X-Git-Tag: BASIC_TPROXY4~247
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7aa6b7cbaaa32c80ef973fe83bf7a20555bc7247;p=thirdparty%2Fsquid.git

ICAP fixes mk2.

AnyAddr is default, drop extra setAnyAddr.
---

diff --git a/src/ICAP/ICAPXaction.cc b/src/ICAP/ICAPXaction.cc
index 2c72113d78..7c4a16a3e3 100644
--- a/src/ICAP/ICAPXaction.cc
+++ b/src/ICAP/ICAPXaction.cc
@@ -100,6 +100,8 @@ void ICAPXaction::start()
 // TODO: obey service-specific, OPTIONS-reported connection limit
 void ICAPXaction::openConnection()
 {
+    IPAddress client_addr;
+
     Must(connection < 0);
 
     const ICAPServiceRep &s = service();
@@ -107,8 +109,6 @@ void ICAPXaction::openConnection()
     if (!TheICAPConfig.reuse_connections)
         disableRetries(); // this will also safely drain pconn pool
 
-    IPAddress client_addr;
-    client_addr.SetAnyAddr();
     // TODO: check whether NULL domain is appropriate here
     connection = icapPconnPool->pop(s.host.buf(), s.port, NULL, client_addr, isRetriable);
     if (connection >= 0) {
@@ -175,7 +175,6 @@ void ICAPXaction::closeConnection()
 
         if (reuseConnection) {
             IPAddress client_addr;
-            client_addr.SetAnyAddr();
             debugs(93,3, HERE << "pushing pconn" << status());
             commSetTimeout(connection, -1, NULL, NULL);
             icapPconnPool->push(connection, theService->host.buf(), theService->port, NULL, client_addr);