From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 25 May 2017 12:44:00 +0000 (+1200)
Subject: Bug 4653: %st lies about tunneled traffic volumes
X-Git-Tag: SQUID_4_0_20~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=545d899c6520217f41a6d75293a19c37d6f6e6ce;p=thirdparty%2Fsquid.git

Bug 4653: %st lies about tunneled traffic volumes

Squid-5 and squid-4 does not count the "HTTP/1.1 200 Connection Established"
header size for %<st formatting code.

This is a Measurement Factory project
---

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 061f483969..c3f9fc3210 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -899,7 +899,7 @@ tunnelStartShoveling(TunnelStateData *tunnelState)
  * Call the tunnelStartShoveling to start the blind pump.
  */
 static void
-tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *, size_t, Comm::Flag flag, int, void *data)
+tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *, size_t len, Comm::Flag flag, int, void *data)
 {
     TunnelStateData *tunnelState = (TunnelStateData *)data;
     debugs(26, 3, HERE << conn << ", flag=" << flag);
@@ -911,6 +911,11 @@ tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *, size_t, Co
         return;
     }
 
+    if (auto http = tunnelState->http.get()) {
+        http->out.headers_sz += len;
+        http->out.size += len;
+    }
+
     tunnelStartShoveling(tunnelState);
 }