From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 24 Mar 2011 15:48:34 +0000 (-0600)
Subject: Bug 3173: Assertion bodyPipe!=NULL on SslBump CONNECT response writing failure
X-Git-Tag: take06~27^2~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fa35be8dee7806250afac6ae26d765b45df4d76;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 60290aec56..f5aeb5d139 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1189,7 +1189,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;
     }