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

   1 ------------------------------------------------------------
   2 revno: 14178
   3 revision-id: squid3@treenet.co.nz-20170701081116-xekwolj1wdkeaxqv
   4 parent: squid3@treenet.co.nz-20170701073754-4x1i6p5s1gzk73co
   5 author: Alex Rousskov <rousskov@measurement-factory.com>
   6 committer: Amos Jeffries <squid3@treenet.co.nz>
   7 branch nick: 3.5
   8 timestamp: Sat 2017-07-01 20:11:16 +1200
   9 message:
  10   Fix message packing error handling in mgr and snmp SMP Forwarders.
  11
  12   A missing "return" resulted in Forwarders sending garbage (or worse) to
  13   Coordinator.
  14 ------------------------------------------------------------
  15 # Bazaar merge directive format 2 (Bazaar 0.90)
  16 # revision_id: squid3@treenet.co.nz-20170701081116-xekwolj1wdkeaxqv
  17 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  18 # testament_sha1: a593abc992a79d4539dede76b4f63e013f96d33a
  19 # timestamp: 2017-07-01 08:51:30 +0000
  20 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  21 # base_revision_id: squid3@treenet.co.nz-20170701073754-\
  22 #   4x1i6p5s1gzk73co
  23 #
  24 # Begin patch
  25 === modified file 'src/ipc/Forwarder.cc'
  26 --- src/ipc/Forwarder.cc        2017-01-01 00:16:45 +0000
  27 +++ src/ipc/Forwarder.cc        2017-07-01 08:11:16 +0000
  28 @@ -62,6 +62,7 @@
  29          // assume the pack() call failed because the message did not fit
  30          // TODO: add a more specific exception?
  31          handleError();
  32 +        return;
  33      }
  34
  35      SendMessage(Ipc::Port::CoordinatorAddr(), message);
  36