------------------------------------------------------------
revno: 13499
revision-id: squid3@treenet.co.nz-20140716121011-oh6k8kpk7r79d433
parent: squid3@treenet.co.nz-20140714125803-t39gkx9wcfve8dm0
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Wed 2014-07-16 06:10:11 -0600
message:
  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
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140716121011-oh6k8kpk7r79d433
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 16fb3064d77005f9a491a6d04b3e97b672eae1d1
# timestamp: 2014-07-16 12:59:57 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140714125803-\
#   t39gkx9wcfve8dm0
# 
# Begin patch
=== modified file 'src/client_side.cc'
--- src/client_side.cc	2014-07-14 09:48:47 +0000
+++ src/client_side.cc	2014-07-16 12:10:11 +0000
@@ -3328,11 +3328,7 @@
     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 @@
     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