From c0ff709f7c849feb6e5774fae2a50efc9297fb9f Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 16 Jul 2014 06:10:11 -0600 Subject: [PATCH] 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 --- src/client_side.cc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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 ¶ms) 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 ¶ms) 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 -- 2.47.2