Merge remote-tracking branch 'official/master'

into SQUID-568-premature-serverconn-use

diff --cc src/FwdState.cc
Simple merge

diff --cc src/FwdState.h
Simple merge

diff --cc src/adaptation/icap/ModXact.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/clients/FtpClient.cc
Simple merge

diff --cc src/clients/FtpGateway.cc
Simple merge

diff --cc src/clients/HttpTunneler.cc
index 20c247c31a0705928a71e7ee6d8472f87a2f8000,0c5e98d8f9b7e1b5f362a13892ff61ca17f32a26..71457866078ac5017b4d4e25159edcbf0ba05945
--- 1/src/clients/HttpTunneler.cc
--- 2/src/clients/HttpTunneler.cc
+++ b/src/clients/HttpTunneler.cc
@@@ -98,14 -98,9 +98,14 @@@ Http::Tunneler::start(
  }
  
  void
- Http::Tunneler::handleConnectionClosure(const CommCloseCbParams &params)
+ Http::Tunneler::handleConnectionClosure(const CommCloseCbParams &)
  {
      closer = nullptr;
 +    if (connection) {
 +        countFailingConnection();
 +        connection->noteClosure();
 +        connection = nullptr;
 +    }
      bailWith(new ErrorState(ERR_CONNECT_FAIL, Http::scBadGateway, request.getRaw(), al));
  }
  

diff --cc src/comm.cc
Simple merge

diff --cc src/dns_internal.cc
Simple merge

diff --cc src/fs/rock/RockRebuild.cc
Simple merge

diff --cc src/gopher.cc
Simple merge

diff --cc src/ident/Ident.cc
Simple merge

diff --cc src/security/PeerConnector.cc
Simple merge

diff --cc src/security/PeerConnector.h
Simple merge

diff --cc src/security/forward.h
Simple merge

diff --cc src/ssl/PeekingPeerConnector.cc
index 5fe335c73745598c7a923adddf43ae354814898f,39d032810b1ccd70d42dfb76436ab6f971fb7fb4..4df73bac0f8142d8d5a938e370693fb2d6d54207
--- 1/src/ssl/PeekingPeerConnector.cc
--- 2/src/ssl/PeekingPeerConnector.cc
+++ b/src/ssl/PeekingPeerConnector.cc
@@@ -24,10 -25,8 +25,8 @@@
  
  CBDATA_NAMESPACED_CLASS_INIT(Ssl, PeekingPeerConnector);
  
- void switchToTunnel(HttpRequest *request, const Comm::ConnectionPointer &clientConn, const Comm::ConnectionPointer &srvConn, const SBuf &preReadServerData);
- 
  void
 -Ssl::PeekingPeerConnector::cbCheckForPeekAndSpliceDone(Acl::Answer answer, void *data)
 +Ssl::PeekingPeerConnector::cbCheckForPeekAndSpliceDone(const Acl::Answer aclAnswer, void *data)
  {
      Ssl::PeekingPeerConnector *peerConnect = (Ssl::PeekingPeerConnector *) data;
      // Use job calls to add done() checks and other job logic/protections.

diff --cc src/tests/stub_libcomm.cc
index 61c12e1d674bdf35ad2842ccc50c8b857cf844c9,b73f0ec59af46a9ee0ab47f2b36fffa4dd4cfe84..555cb77d79afebf9fd760b39e20182565cf259a9
--- 1/src/tests/stub_libcomm.cc
--- 2/src/tests/stub_libcomm.cc
+++ b/src/tests/stub_libcomm.cc
@@@ -22,11 -22,11 +22,11 @@@ void Comm::AcceptLimiter::kick() STU
  #include "comm/Connection.h"
  Comm::Connection::Connection() STUB
  Comm::Connection::~Connection() STUB
 -Comm::ConnectionPointer Comm::Connection::cloneIdentDetails() const STUB_RETVAL(nullptr)
 -Comm::ConnectionPointer Comm::Connection::cloneDestinationDetails() const STUB_RETVAL(nullptr)
 +Comm::ConnectionPointer Comm::Connection::cloneProfile() const STUB_RETVAL(nullptr)
  void Comm::Connection::close() STUB
 +void Comm::Connection::noteClosure() STUB
  CachePeer * Comm::Connection::getPeer() const STUB_RETVAL(NULL)
- void Comm::Connection::setPeer(CachePeer * p) STUB
+ void Comm::Connection::setPeer(CachePeer *) STUB
  ScopedId Comm::Connection::codeContextGist() const STUB_RETVAL(id.detach())
  std::ostream &Comm::Connection::detailCodeContext(std::ostream &os) const STUB_RETVAL(os)
  InstanceIdDefinitions(Comm::Connection, "conn", uint64_t);

diff --cc src/tests/stub_libsecurity.cc
Simple merge

diff --cc src/tunnel.cc
Simple merge

diff --cc src/whois.cc
Simple merge