From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Wed, 30 Mar 2011 11:53:48 +0000 (-0600)
Subject: Bug 3173: Assertion bodyPipe!=NULL on SslBump CONNECT response writing failure
X-Git-Tag: SQUID_3_1_12~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc1beeb0e413265e5cb6ec8e5cd373ea6f6a3a2a;p=thirdparty%2Fsquid.git

Bug 3173: Assertion bodyPipe!=NULL on SslBump CONNECT response writing failure

Do not call ConnStateData::startClosing() when we fail to write our CONNECT
response while bumping a connection. startClosing() can only be used when we
handle response bodies. Just close the connection, in hope that the connection
close handler kicks in and cleans up.
---

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index a0034d9c56..aee8a0cd77 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1178,7 +1178,8 @@ ClientHttpRequest::sslBumpEstablish(comm_err_t errflag)
         return;
 
     if (errflag) {
-        getConn()->startClosing("CONNECT response failure in SslBump");
+        debugs(85, 3, HERE << "CONNECT response failure in SslBump: " << errflag);
+        comm_close(getConn()->fd);
         return;
     }