---------------------
PatchSet 7120 
Date: 2005/10/22 18:00:35
Author: hno
Branch: negotiate-2_5
Tag: (none) 
Log:
Fix that \r trimming slightly differently to not cause conflicts with
overlapped helper requests

Members: 
	src/helper.c:1.16.2.14.2.2->1.16.2.14.2.3 

Index: squid/src/helper.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/helper.c,v
retrieving revision 1.16.2.14.2.2
retrieving revision 1.16.2.14.2.3
diff -u -r1.16.2.14.2.2 -r1.16.2.14.2.3
--- squid/src/helper.c	22 Oct 2005 14:23:26 -0000	1.16.2.14.2.2
+++ squid/src/helper.c	22 Oct 2005 18:00:35 -0000	1.16.2.14.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: helper.c,v 1.16.2.14.2.2 2005/10/22 14:23:26 hno Exp $
+ * $Id: helper.c,v 1.16.2.14.2.3 2005/10/22 18:00:35 hno Exp $
  *
  * DEBUG: section 84    Helper process maintenance
  * AUTHOR: Harvest Derived?
@@ -673,7 +673,7 @@
 	/* end of reply found */
 	debug(84, 3) ("helperHandleRead: end of reply found\n");
 	if (t > srv->buf && t[-1] == '\r')
-	    t--;
+	    t[-1] = '\0';
 	*t = '\0';
 	srv->flags.busy = 0;
 	srv->offset = 0;
@@ -732,7 +732,7 @@
 	/* end of reply found */
 	debug(84, 3) ("helperStatefulHandleRead: end of reply found\n");
 	if (t > srv->buf && t[-1] == '\r')
-	    t--;
+	    t[-1] = '\0';
 	*t = '\0';
 	srv->flags.busy = 0;
 	srv->offset = 0;