From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sat, 29 Jun 2013 08:20:01 +0000 (-0600)
Subject: Make sure %<tt includes all [failed] connection attempts.
X-Git-Tag: SQUID_3_3_6~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cff1b07e69ee2779d37af4cdac6b0e60b5308b2;p=thirdparty%2Fsquid.git

Make sure %<tt includes all [failed] connection attempts.

The old code was using zero n_tries to detect the first connection
attempt,
but n_tries is not incremented when we are opening a new connection
rather
than reusing an old one. Perhaps n_tries should be updated differently
as
well, but this change simply makes %<tt (hier.total_response_time)
management
independent from that [complex] counter.
---

diff --git a/src/forward.cc b/src/forward.cc
index 295e6dfc57..5afce2b00e 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -935,7 +935,7 @@ FwdState::connectStart()
 
     debugs(17, 3, "fwdConnectStart: " << entry->url());
 
-    if (n_tries == 0) // first attempt
+    if (!request->hier.first_conn_start.tv_sec) // first attempt
         request->hier.first_conn_start = current_time;
 
     /* connection timeout */