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

   1 ------------------------------------------------------------
   2 revno: 14166
   3 revision-id: squid3@treenet.co.nz-20170529125748-qt7yhdloygl4xosg
   4 parent: squid3@treenet.co.nz-20170529071037-o91o8xvaqata5y2b
   5 committer: Amos Jeffries <squid3@treenet.co.nz>
   6 branch nick: 3.5
   7 timestamp: Tue 2017-05-30 00:57:48 +1200
   8 message:
   9   Revert r14161
  10
  11   Wrong patch and commit message.
  12 ------------------------------------------------------------
  13 # Bazaar merge directive format 2 (Bazaar 0.90)
  14 # revision_id: squid3@treenet.co.nz-20170529125748-qt7yhdloygl4xosg
  15 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  16 # testament_sha1: ddecde537486c58df04564f3818b8ad9929dd186
  17 # timestamp: 2017-05-29 13:51:06 +0000
  18 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  19 # base_revision_id: squid3@treenet.co.nz-20170529071037-\
  20 #   o91o8xvaqata5y2b
  21 #
  22 # Begin patch
  23 === modified file 'src/tunnel.cc'
  24 --- src/tunnel.cc       2017-05-29 05:33:59 +0000
  25 +++ src/tunnel.cc       2017-05-29 12:57:48 +0000
  26 @@ -836,7 +836,7 @@
  27   * Call the tunnelStartShoveling to start the blind pump.
  28   */
  29  static void
  30 -tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *, size_t len, Comm::Flag flag, int, void *data)
  31 +tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *buf, size_t size, Comm::Flag flag, int xerrno, void *data)
  32  {
  33      TunnelStateData *tunnelState = (TunnelStateData *)data;
  34      debugs(26, 3, HERE << conn << ", flag=" << flag);
  35 @@ -848,11 +848,6 @@
  36          return;
  37      }
  38
  39 -    if (ClientHttpRequest *http = tunnelState->http.get()) {
  40 -        http->out.headers_sz += len;
  41 -        http->out.size += len;
  42 -    }
  43 -
  44      tunnelStartShoveling(tunnelState);
  45  }
  46
  47