From 719dc2430dc757156e31436627000635c0daca9b Mon Sep 17 00:00:00 2001 From: Automatic source maintenance Date: Thu, 10 Jul 2014 18:15:30 -0600 Subject: [PATCH] SourceFormat Enforcement --- src/PeerPoolMgr.cc | 2 +- src/ssl/PeerConnector.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PeerPoolMgr.cc b/src/PeerPoolMgr.cc index 7ffc9f6290..d96a787c2e 100644 --- a/src/PeerPoolMgr.cc +++ b/src/PeerPoolMgr.cc @@ -115,7 +115,7 @@ PeerPoolMgr::handleOpenedConnection(const CommConnectCbParams ¶ms) MyAnswerDialer(this, &PeerPoolMgr::handleSecuredPeer)); const int peerTimeout = peer->connect_timeout > 0 ? - peer->connect_timeout : Config.Timeout.peer_connect; + peer->connect_timeout : Config.Timeout.peer_connect; const int timeUsed = squid_curtime - params.conn->startTime(); // Use positive timeout when less than one second is left for conn. const int timeLeft = max(1, (peerTimeout - timeUsed)); diff --git a/src/ssl/PeerConnector.h b/src/ssl/PeerConnector.h index ea31d87b4b..4607e025e3 100644 --- a/src/ssl/PeerConnector.h +++ b/src/ssl/PeerConnector.h @@ -77,7 +77,7 @@ public: * establishment timeout and close the connection on timeouts. This is probably * better than having dedicated (or none at all!) timeouts for peer selection, * DNS lookup, TCP handshake, SSL handshake, etc. Some steps may have their - * own timeout, but not all steps should be forced to have theirs. + * own timeout, but not all steps should be forced to have theirs. * XXX: tunnel.cc and probably other subsystems does not have an "overall * connection establishment" timeout. We need to change their code so that they * start monitoring earlier and close on timeouts. This change may need to be @@ -126,7 +126,7 @@ protected: /// Sets the read timeout to avoid getting stuck while reading from a /// silent server - void setReadTimeout(); + void setReadTimeout(); void initializeSsl(); ///< Initializes SSL state -- 2.47.2