---------------------
PatchSet 7116 
Date: 2005/10/22 14:23:26
Author: hno
Branch: negotiate-2_5
Tag: (none) 
Log:
Be friendly to Windows helpers and chop that annoying \r off from the
end of their responses..

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

Index: squid/src/helper.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/helper.c,v
retrieving revision 1.16.2.14.2.1
retrieving revision 1.16.2.14.2.2
diff -u -r1.16.2.14.2.1 -r1.16.2.14.2.2
--- squid/src/helper.c	15 Apr 2005 01:29:42 -0000	1.16.2.14.2.1
+++ squid/src/helper.c	22 Oct 2005 14:23:26 -0000	1.16.2.14.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: helper.c,v 1.16.2.14.2.1 2005/04/15 01:29:42 squidadm Exp $
+ * $Id: helper.c,v 1.16.2.14.2.2 2005/10/22 14:23:26 hno Exp $
  *
  * DEBUG: section 84    Helper process maintenance
  * AUTHOR: Harvest Derived?
@@ -672,6 +672,8 @@
     } else if ((t = strchr(srv->buf, '\n'))) {
 	/* end of reply found */
 	debug(84, 3) ("helperHandleRead: end of reply found\n");
+	if (t > srv->buf && t[-1] == '\r')
+	    t--;
 	*t = '\0';
 	srv->flags.busy = 0;
 	srv->offset = 0;
@@ -729,6 +731,8 @@
     } else if ((t = strchr(srv->buf, '\n'))) {
 	/* end of reply found */
 	debug(84, 3) ("helperStatefulHandleRead: end of reply found\n");
+	if (t > srv->buf && t[-1] == '\r')
+	    t--;
 	*t = '\0';
 	srv->flags.busy = 0;
 	srv->offset = 0;