---------------------
PatchSet 5436 
Date: 2002/10/22 20:44:43
Author: serassio
Branch: cygwin-svc
Tag: (none) 
Log:
Merged latest win32 changes from nt branch

Members: 
	src/cf.data.pre:1.10.2.3.2.31->1.10.2.3.2.32 
	src/client_side_request.c:1.3.4.3->1.3.4.4 

Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v
retrieving revision 1.10.2.3.2.31
retrieving revision 1.10.2.3.2.32
diff -u -r1.10.2.3.2.31 -r1.10.2.3.2.32
--- squid/src/cf.data.pre	22 Oct 2002 19:57:32 -0000	1.10.2.3.2.31
+++ squid/src/cf.data.pre	22 Oct 2002 20:44:43 -0000	1.10.2.3.2.32
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.10.2.3.2.31 2002/10/22 19:57:32 serassio Exp $
+# $Id: cf.data.pre,v 1.10.2.3.2.32 2002/10/22 20:44:43 serassio Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1922,7 +1922,7 @@
 DEFAULT: 10 seconds
 DOC_START
 	Maximum time to wait for IDENT lookups to complete.
-
+	
 	If this is too high, and you enabled IDENT lookups from untrusted
 	users, then you might be susceptible to denial-of-service by having
 	many ident requests going at once.
Index: squid/src/client_side_request.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/client_side_request.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- squid/src/client_side_request.c	22 Oct 2002 19:57:33 -0000	1.3.4.3
+++ squid/src/client_side_request.c	22 Oct 2002 20:44:44 -0000	1.3.4.4
@@ -1,10 +1,11 @@
 
 /*
- * $Id: client_side_request.c,v 1.3.4.3 2002/10/22 19:57:33 serassio Exp $
- *
+ * $Id: client_side_request.c,v 1.3.4.4 2002/10/22 20:44:44 serassio Exp $
+ * 
  * DEBUG: section 85    Client-side Request Routines
- * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
- *
+ * AUTHOR: Robert Collins
+ * (Originally Duane Wessels in client_side.c)
+ * 
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *