------------------------------------------------------------ revno: 13792 revision-id: squid3@treenet.co.nz-20150409021055-s7gqwsa29f8vfpvy parent: squid3@treenet.co.nz-20150409020831-najhozzj9qc0oj7q fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4198 author: Christos Tsantilas committer: Amos Jeffries branch nick: 3.5 timestamp: Wed 2015-04-08 19:10:55 -0700 message: Bug 4198: assertion failed: client_side.h:364: "sslServerBump == srvBump" After a failed http_access acl check of an HTTP request, tunneled through a SSL bumped connection, ssl bumping code try to re-setup the connection for a client-first bumping mode to serve the error crashing squid. This is a Measurement Factory project ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150409021055-s7gqwsa29f8vfpvy # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 7307a9bf2a083c74d20923352692ec3c005c92e5 # timestamp: 2015-04-09 02:16:48 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150409020831-\ # najhozzj9qc0oj7q # # Begin patch === modified file 'src/client_side_request.cc' --- src/client_side_request.cc 2015-01-13 09:13:49 +0000 +++ src/client_side_request.cc 2015-04-09 02:10:55 +0000 @@ -1417,7 +1417,8 @@ if (bumpMode != Ssl::bumpEnd) { debugs(85, 5, HERE << "SslBump already decided (" << bumpMode << "), " << "ignoring ssl_bump for " << http->getConn()); - http->sslBumpNeed(bumpMode); // for processRequest() to bump if needed + if (!http->getConn()->serverBump()) + http->sslBumpNeed(bumpMode); // for processRequest() to bump if needed and not already bumped http->al->ssl.bumpMode = bumpMode; // inherited from bumped connection return false; }