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

   1 ------------------------------------------------------------
   2 revno: 14072
   3 revision-id: squid3@treenet.co.nz-20160817025828-s4102klt2ei25tsm
   4 parent: squid3@treenet.co.nz-20160817025501-e66sjxm0bfy3ksn3
   5 committer: Amos Jeffries <squid3@treenet.co.nz>
   6 branch nick: 3.5
   7 timestamp: Wed 2016-08-17 14:58:28 +1200
   8 message:
   9   Fix SSL-Bump failure results in SEGFAULT
  10 ------------------------------------------------------------
  11 # Bazaar merge directive format 2 (Bazaar 0.90)
  12 # revision_id: squid3@treenet.co.nz-20160817025828-s4102klt2ei25tsm
  13 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  14 # testament_sha1: 73877d276fba41282aeb5973207d02851d5eb784
  15 # timestamp: 2016-08-17 03:50:56 +0000
  16 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  17 # base_revision_id: squid3@treenet.co.nz-20160817025501-\
  18 #   e66sjxm0bfy3ksn3
  19 #
  20 # Begin patch
  21 === modified file 'src/client_side_request.cc'
  22 --- src/client_side_request.cc  2016-05-06 08:24:29 +0000
  23 +++ src/client_side_request.cc  2016-08-17 02:58:28 +0000
  24 @@ -1811,7 +1811,7 @@
  25              repContext->setReplyToStoreEntry(e, "immediate SslBump error");
  26              errorAppendEntry(e, calloutContext->error);
  27              calloutContext->error = NULL;
  28 -            if (calloutContext->readNextRequest)
  29 +            if (calloutContext->readNextRequest && getConn())
  30                  getConn()->flags.readMore = true; // resume any pipeline reads.
  31              node = (clientStreamNode *)client_stream.tail->data;
  32              clientStreamRead(node, this, node->readBuffer);
  33