------------------------------------------------------------
revno: 14021
revision-id: squid3@treenet.co.nz-20160411124138-zsrf0ltaxlj25k2x
parent: squid3@treenet.co.nz-20160407044345-cfz2s2rkr7vbigal
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=2460
author: Lubos Uhliarik <luhliari@redhat.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Tue 2016-04-12 00:41:38 +1200
message:
  Bug 2460 partial: workaround deferred reads on shutdown and restart
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160411124138-zsrf0ltaxlj25k2x
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 2c7f2399122d9d9583236515c9679aa7f4786d9f
# timestamp: 2016-04-11 12:50:52 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160407044345-\
#   cfz2s2rkr7vbigal
# 
# Begin patch
=== modified file 'src/comm.cc'
--- src/comm.cc	2016-02-29 19:20:49 +0000
+++ src/comm.cc	2016-04-11 12:41:38 +0000
@@ -1743,7 +1743,7 @@
     //       amount of time. We must re-validate that it is active and usable.
 
     // If the connection has been closed already. Cancel this read.
-    if (!Comm::IsConnOpen(read.theRead.conn)) {
+    if (!fd_table || !Comm::IsConnOpen(read.theRead.conn)) {
         if (read.closer != NULL) {
             read.closer->cancel("Connection closed before.");
             read.closer = NULL;