From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 16 Jul 2014 12:10:11 +0000 (-0600)
Subject: Fix http_port after rev.13497
X-Git-Tag: SQUID_3_5_0_1~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0ff709f7c849feb6e5774fae2a50efc9297fb9f;p=thirdparty%2Fsquid.git

Fix http_port after rev.13497

Also, remove dead code if-statement in httpAccept(). Replace with a note
that the call may have been queued when a reconfgure happened to the port
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 0db586e552..65344d0a72 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3328,11 +3328,7 @@ httpAccept(const CommAcceptCbParams &params)
     MasterXaction::Pointer xact = params.xaction;
     AnyP::PortCfgPointer s = xact->squidPort;
 
-    if (!s) {
-        // it is possible the call or accept() was still queued when the port was reconfigured
-        debugs(33, 2, "HTTP accept failure: port reconfigured.");
-        return;
-    }
+    // NP: it is possible the port was reconfigured when the call or accept() was queued.
 
     if (params.flag != Comm::OK) {
         // Its possible the call was still queued when the client disconnected
@@ -3646,11 +3642,7 @@ httpsAccept(const CommAcceptCbParams &params)
     MasterXaction::Pointer xact = params.xaction;
     const AnyP::PortCfgPointer s = xact->squidPort;
 
-    if (!s.valid()) {
-        // it is possible the call or accept() was still queued when the port was reconfigured
-        debugs(33, 2, "HTTPS accept failure: port reconfigured.");
-        return;
-    }
+    // NP: it is possible the port was reconfigured when the call or accept() was queued.
 
     if (params.flag != Comm::OK) {
         // Its possible the call was still queued when the client disconnected