------------------------------------------------------------ revno: 12077 revision-id: squidadm@squid-cache.org-20120307013225-uvx2t179h8fxz0ik parent: squid3@treenet.co.nz-20120307002634-8um83ju2ukxzdm7o committer: Automatic source maintenance branch nick: trunk timestamp: Tue 2012-03-06 18:32:25 -0700 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20120307013225-\ # uvx2t179h8fxz0ik # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 6a9519a274f7f57ce85e99705d02f3e803397e72 # timestamp: 2012-03-07 01:57:19 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20120307002634-\ # 8um83ju2ukxzdm7o # # Begin patch === modified file 'src/BodyPipe.cc' --- src/BodyPipe.cc 2012-03-07 00:26:34 +0000 +++ src/BodyPipe.cc 2012-03-07 01:32:25 +0000 @@ -277,7 +277,7 @@ if (!abortedConsumption && !exhausted()) { // Before we abort, any regular consumption should be over and auto - // consumption must not be started. + // consumption must not be started. Must(!theConsumer); AsyncCall::Pointer call= asyncCall(91, 7,