src/patches/squid/squid-3.5-14161.patch

   1 ------------------------------------------------------------
   2 revno: 14161
   3 revision-id: squid3@treenet.co.nz-20170529053359-xtbuev2zwmdfj9mp
   4 parent: squid3@treenet.co.nz-20170529043852-zkf91gxhaqdj0rkn
   5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4682
   6 author: Christos Tsantilas <chtsanti@users.sourceforge.net>
   7 committer: Amos Jeffries <squid3@treenet.co.nz>
   8 branch nick: 3.5
   9 timestamp: Mon 2017-05-29 17:33:59 +1200
  10 message:
  11   Bug 4653: %st lies about tunneled traffic volumes
  12
  13   Squid-5 and squid-4 does not count the "HTTP/1.1 200 Connection Established"
  14   header size for %<st formatting code.
  15
  16   This is a Measurement Factory project
  17 ------------------------------------------------------------
  18 # Bazaar merge directive format 2 (Bazaar 0.90)
  19 # revision_id: squid3@treenet.co.nz-20170529053359-xtbuev2zwmdfj9mp
  20 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  21 # testament_sha1: c340785d0d5042ae0f783d606f0998d605290ac4
  22 # timestamp: 2017-05-29 05:51:04 +0000
  23 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  24 # base_revision_id: squid3@treenet.co.nz-20170529043852-\
  25 #   zkf91gxhaqdj0rkn
  26 #
  27 # Begin patch
  28 === modified file 'src/tunnel.cc'
  29 --- src/tunnel.cc       2017-01-01 00:16:45 +0000
  30 +++ src/tunnel.cc       2017-05-29 05:33:59 +0000
  31 @@ -836,7 +836,7 @@
  32   * Call the tunnelStartShoveling to start the blind pump.
  33   */
  34  static void
  35 -tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *buf, size_t size, Comm::Flag flag, int xerrno, void *data)
  36 +tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *, size_t len, Comm::Flag flag, int, void *data)
  37  {
  38      TunnelStateData *tunnelState = (TunnelStateData *)data;
  39      debugs(26, 3, HERE << conn << ", flag=" << flag);
  40 @@ -848,6 +848,11 @@
  41          return;
  42      }
  43
  44 +    if (ClientHttpRequest *http = tunnelState->http.get()) {
  45 +        http->out.headers_sz += len;
  46 +        http->out.size += len;
  47 +    }
  48 +
  49      tunnelStartShoveling(tunnelState);
  50  }
  51
  52