---------------------
PatchSet 1492 
Date: 2001/02/05 13:52:12
Author: rbcollins
Branch: rbcollins_filters
Tag: (none) 
Log:
touchup after merge

Members: 
	src/client_side.c:1.1.1.3.4.1.4.15.2.21->1.1.1.3.4.1.4.15.2.22 
	src/http.c:1.1.1.3.4.1.4.12.2.9->1.1.1.3.4.1.4.12.2.10 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.1.1.3.4.1.4.15.2.21
retrieving revision 1.1.1.3.4.1.4.15.2.22
diff -u -r1.1.1.3.4.1.4.15.2.21 -r1.1.1.3.4.1.4.15.2.22
--- squid/src/client_side.c	5 Feb 2001 13:37:10 -0000	1.1.1.3.4.1.4.15.2.21
+++ squid/src/client_side.c	5 Feb 2001 13:52:12 -0000	1.1.1.3.4.1.4.15.2.22
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.1.1.3.4.1.4.15.2.21 2001/02/05 13:37:10 rbcollins Exp $
+ * $Id: client_side.c,v 1.1.1.3.4.1.4.15.2.22 2001/02/05 13:52:12 rbcollins Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2477,7 +2477,7 @@
 	return;
 	}
 
-	if (httpReplyBodySize(http->request->method, entry->mem_obj->reply) < 0) {
+	if (httpReplyBodySize(http->request->method, entry->mem_obj->reply) < 0 && !(http->request->flags.te_encoding)) {
 	    debug(33, 5) ("clientWriteComplete: closing, content_length < 0\n");
 	    comm_close(fd);
 	} else if (!done) {
Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/http.c,v
retrieving revision 1.1.1.3.4.1.4.12.2.9
retrieving revision 1.1.1.3.4.1.4.12.2.10
diff -u -r1.1.1.3.4.1.4.12.2.9 -r1.1.1.3.4.1.4.12.2.10
--- squid/src/http.c	5 Feb 2001 13:37:12 -0000	1.1.1.3.4.1.4.12.2.9
+++ squid/src/http.c	5 Feb 2001 13:52:13 -0000	1.1.1.3.4.1.4.12.2.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.c,v 1.1.1.3.4.1.4.12.2.9 2001/02/05 13:37:12 rbcollins Exp $
+ * $Id: http.c,v 1.1.1.3.4.1.4.12.2.10 2001/02/05 13:52:13 rbcollins Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -584,7 +584,9 @@
 {
     HttpStateData *httpState = data;
     StoreEntry *entry = httpState->entry;
-    const request_t *request = httpState->request;
+    /* this was a const request_t... maybe it still should be, but the filterBuildChain
+     * and thus, all filters, should not modify the request_t struct... hmmm */
+    request_t *request = httpState->request;
     FILTER_list *temp_filter;
     debug(1,1)("Processing data (len=%d\n",len);
 	if (httpState->reply_hdr_state < 2) {