------------------------------------------------------------
revno: 13485
revision-id: squidadm@squid-cache.org-20140711001530-bc8w064l1ehz10e4
parent: chtsanti@users.sourceforge.net-20140710144753-ewrjoym32fapn2mx
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Thu 2014-07-10 18:15:30 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20140711001530-\
#   bc8w064l1ehz10e4
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: e948c1a97c2859ac0721805f7436b5e550fb13cc
# timestamp: 2014-07-11 00:54:36 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: chtsanti@users.sourceforge.net-20140710144753-\
#   ewrjoym32fapn2mx
# 
# Begin patch
=== modified file 'src/PeerPoolMgr.cc'
--- src/PeerPoolMgr.cc	2014-07-10 14:47:53 +0000
+++ src/PeerPoolMgr.cc	2014-07-11 00:15:30 +0000
@@ -115,7 +115,7 @@
                             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));

=== modified file 'src/ssl/PeerConnector.h'
--- src/ssl/PeerConnector.h	2014-07-10 14:47:53 +0000
+++ src/ssl/PeerConnector.h	2014-07-11 00:15:30 +0000
@@ -77,7 +77,7 @@
  * 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 @@
 
     /// Sets the read timeout to avoid getting stuck while reading from a
     /// silent server
-    void setReadTimeout(); 
+    void setReadTimeout();
 
     void initializeSsl(); ///< Initializes SSL state