From: rousskov <>
Date: Tue, 16 Oct 2007 21:57:28 +0000 (+0000)
Subject: Bug 2104 fix: handle REQMOD HTTP responses without body
X-Git-Tag: SQUID_3_0_STABLE1~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb4c42884356410ff06d2c69c4e776c80c0c5aa1;p=thirdparty%2Fsquid.git

Bug 2104 fix: handle REQMOD HTTP responses without body

When in request satisfaction mode and no body is expected, mark the store
entry as complete. Otherwise the ClientStreams(?) triggered by the
clientGetMoreData call will get stuck waiting for more data from the store.
There is probably a better way to do this (e.g., completely bypassing store).
---

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 06ecf27d11..5f79676f49 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.93 2007/09/27 22:42:08 hno Exp $
+ * $Id: client_side_request.cc,v 1.94 2007/10/16 15:57:28 rousskov Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -1136,6 +1136,9 @@ ClientHttpRequest::noteIcapAnswer(HttpMsg *msg)
         request_satisfaction_mode = true;
         request_satisfaction_offset = 0;
         storeEntry()->replaceHttpReply(new_rep);
+
+        if (!icapBodySource) // no body
+            storeEntry()->complete();
         clientGetMoreData(node, this);
     }