From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 18 Jun 2013 22:30:39 +0000 (-0600)
Subject: Make sure %<tt includes all [failed] connection attempts.
X-Git-Tag: SQUID_3_4_0_1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a122fdeb98cd8ec945765bf8d8f7a0253f745f6a;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/FwdState.cc b/src/FwdState.cc
index 210fea6084..06a5350316 100644
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -1079,7 +1079,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 */