---------------------
PatchSet 1584 
Date: 2005/08/24 15:27:58
Author: rousskov
Branch: squid3-icap
Tag: (none) 
Log:
- Consume adapted content after it was written to the store entry.
- Fixed fwdReforwardableStatus() call params (Ralf Horstmann)

Members: 
	src/http.cc:1.49.2.9->1.49.2.10 

Index: squid3/src/http.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/http.cc,v
retrieving revision 1.49.2.9
retrieving revision 1.49.2.10
diff -u -r1.49.2.9 -r1.49.2.10
--- squid3/src/http.cc	24 Aug 2005 05:58:28 -0000	1.49.2.9
+++ squid3/src/http.cc	24 Aug 2005 15:27:58 -0000	1.49.2.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.49.2.9 2005/08/24 05:58:28 rousskov Exp $
+ * $Id: http.cc,v 1.49.2.10 2005/08/24 15:27:58 rousskov Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -807,7 +807,7 @@
      * If its not a reply that we will re-forward, then
      * allow the client to get it.
      */
-    if (!fwdReforwardableStatus(s))
+    if (!fwdReforwardableStatus(getReply()->sline.status))
         EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
 
     switch (cacheableReply()) {
@@ -2011,8 +2011,10 @@
     assert(this);
     debug(11,5)("\t%d bytes\n", buf->contentSize());
     debug(11,5)("\t%d is current offset\n", (int)currentOffset);
-    entry->write(StoreIOBuffer(buf, currentOffset));
+
+    entry->write(StoreIOBuffer(buf, currentOffset)); // write everything
     currentOffset += buf->contentSize();
+	buf->consume(buf->contentSize()); // consume everything written
 }
 
 void