------------------------------------------------------------
revno: 13667
revision-id: squid3@treenet.co.nz-20141203113501-fvu8pux9k17e62ks
parent: squid3@treenet.co.nz-20141121093616-qxbj1bq2zmsx1u4y
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4146
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Wed 2014-12-03 03:35:01 -0800
message:
  Bug 4146: workaround SSL Bump crash on Linux
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141203113501-fvu8pux9k17e62ks
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 27098822bfea76a4df6a6bf021719ffdeab5f639
# timestamp: 2014-12-03 11:44:54 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20141121093616-\
#   qxbj1bq2zmsx1u4y
# 
# Begin patch
=== modified file 'src/comm.cc'
--- src/comm.cc	2014-09-25 13:33:18 +0000
+++ src/comm.cc	2014-12-03 11:35:01 +0000
@@ -102,9 +102,14 @@
 comm_empty_os_read_buffers(int fd)
 {
 #if _SQUID_LINUX_
+#if USE_OPENSSL
+    // Bug 4146: SSL-Bump BIO does not release sockets on close.
+    if (fd_table[fd].ssl)
+        return;
+#endif
+
     /* prevent those nasty RST packets */
     char buf[SQUID_TCP_SO_RCVBUF];
-
     if (fd_table[fd].flags.nonblocking) {
         while (FD_READ_METHOD(fd, buf, SQUID_TCP_SO_RCVBUF) > 0) {};
     }