From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 12 Dec 2010 23:29:26 +0000 (-0700)
Subject: Handle early eCAP transaction failures better.
X-Git-Tag: take00~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8b041fcabe1a8f4300652a2c79bf2965d423543;p=thirdparty%2Fsquid.git

Handle early eCAP transaction failures better.

Do not throw an exception if eCAP transaction had to deal with a virgin body
but was not consuming it at swangSong() time. This may happen if the eCAP
adapter throws an exception before the adapter requests the virgin body
transmission or after it stops the transmission. In other words, the
transaction wrapper consumes only if proxyingVb is on.
---

diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc
index 95f2ae53dc..a638049cc9 100644
--- a/src/adaptation/ecap/XactionRep.cc
+++ b/src/adaptation/ecap/XactionRep.cc
@@ -88,7 +88,7 @@ Adaptation::Ecap::XactionRep::swanSong()
         }
     }
 
-    {
+    if (proxyingVb == opOn) {
         BodyPipe::Pointer body_pipe = theVirginRep.raw().body_pipe;
         if (body_pipe != NULL) {
             Must(body_pipe->stillConsuming(this));