From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 7 Mar 2012 01:35:59 +0000 (-0700)
Subject: Revert rev10436. Correct patch already applied in 3.1.19
X-Git-Tag: SQUID_3_1_20~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7323c4153c0967fa2e25a71e772da4e283ad867;p=thirdparty%2Fsquid.git

Revert rev10436. Correct patch already applied in 3.1.19
---

diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc
index fdd6b4ca0c..417e1bbd4b 100644
--- a/src/BodyPipe.cc
+++ b/src/BodyPipe.cc
@@ -258,28 +258,14 @@ BodyPipe::clearConsumer()
 void
 BodyPipe::expectNoConsumption()
 {
-    // We may be called multiple times because multiple jobs on the consumption
-    // chain may realize that there will be no more setConsumer() calls (e.g.,
-    // consuming code and retrying code). It is both difficult and not really
-    // necessary for them to coordinate their expectNoConsumption() calls.
-
-    // As a consequence, we may be called when we are auto-consuming already.
-
+    Must(!theConsumer);
     if (!abortedConsumption && !exhausted()) {
-        // Before we abort, any regular consumption should be over and auto
-		// consumption must not be started.
-        Must(!theConsumer);
-
         AsyncCall::Pointer call= asyncCall(91, 7,
                                            "BodyProducer::noteBodyConsumerAborted",
                                            BodyProducerDialer(theProducer,
                                                               &BodyProducer::noteBodyConsumerAborted, this));
         ScheduleCallHere(call);
         abortedConsumption = true;
-
-        // in case somebody enabled auto-consumption before regular one aborted
-        if (mustAutoConsume)
-            startAutoConsumption();
     }
 }