---------------------
PatchSet 121 
Date: 2000/04/15 00:06:29
Author: hno
Branch: ntlm
Tag: (none) 
Log:
Fixed some patch merge errors

Members: 
	src/client_side.c:1.1.1.3.4.1.2.3->1.1.1.3.4.1.2.4 

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.2.3
retrieving revision 1.1.1.3.4.1.2.4
diff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4
--- squid/src/client_side.c	14 Apr 2000 23:09:53 -0000	1.1.1.3.4.1.2.3
+++ squid/src/client_side.c	15 Apr 2000 00:06:29 -0000	1.1.1.3.4.1.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.1.1.3.4.1.2.3 2000/04/14 23:09:53 hno Exp $
+ * $Id: client_side.c,v 1.1.1.3.4.1.2.4 2000/04/15 00:06:29 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2368,7 +2368,6 @@
 	}
 	/* Continue to process previously read data */
     }
-    conn->in.offset += size;
     commSetSelect(fd, COMM_SELECT_READ, clientReadRequest, conn, 0);
     /* Process request body if any */
     if (conn->in.offset > 0 && conn->body.callback != NULL)
@@ -2560,7 +2559,7 @@
 {
     ConnStateData *conn = request->body_connection;
     if (!conn) {
-	debug(33, 1) ("clientReadBody: no body to read, request=%p\n",request);
+	debug(33, 5) ("clientReadBody: no body to read, request=%p\n",request);
 	callback(buf,0,cbdata); /* Signal end of body */
 	return;
     }