---------------------
PatchSet 6567 
Date: 2005/03/29 08:32:37
Author: swsf
Branch: epoll-2_5
Tag: (none) 
Log:
Needed curly braces in patch earlier today

Members: 
	helpers/external_acl/ldap_group/squid_ldap_group.8:1.1.2.7->1.1.2.7.8.1 
	src/forward.c:1.13.6.13.4.3->1.13.6.13.4.4 

Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.8
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ldap_group/squid_ldap_group.8,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.7.8.1
diff -u -r1.1.2.7 -r1.1.2.7.8.1
--- squid/helpers/external_acl/ldap_group/squid_ldap_group.8	31 Jan 2005 03:14:43 -0000	1.1.2.7
+++ squid/helpers/external_acl/ldap_group/squid_ldap_group.8	29 Mar 2005 08:32:37 -0000	1.1.2.7.8.1
@@ -1,4 +1,4 @@
-.TH squid_ldap_group 8 "14 January 2005" "Squid LDAP Group"
+.TH squid_ldap_group 8 "30 January 2005" "Version 2.17-2.5"
 .
 .SH NAME
 squid_ldap_group - Squid LDAP external acl group helper
Index: squid/src/forward.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/forward.c,v
retrieving revision 1.13.6.13.4.3
retrieving revision 1.13.6.13.4.4
diff -u -r1.13.6.13.4.3 -r1.13.6.13.4.4
--- squid/src/forward.c	29 Mar 2005 03:00:05 -0000	1.13.6.13.4.3
+++ squid/src/forward.c	29 Mar 2005 08:32:38 -0000	1.13.6.13.4.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.c,v 1.13.6.13.4.3 2005/03/29 03:00:05 swsf Exp $
+ * $Id: forward.c,v 1.13.6.13.4.4 2005/03/29 08:32:38 swsf Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -701,13 +701,15 @@
 	 * is disk clients pending on a too large object being fetched and a
 	 * few other corner cases.
 	 */
-	if (mem->inmem_hi - mem->inmem_lo > SM_PAGE_SIZE + Config.Store.maxInMemObjSize + READ_AHEAD_GAP)
+	if (mem->inmem_hi - mem->inmem_lo > SM_PAGE_SIZE + Config.Store.maxInMemObjSize + READ_AHEAD_GAP) {
 	    EBIT_SET(e->flags, ENTRY_DEFER_READ);
 	    return 1;
+	}
     }
-    if (mem->inmem_hi - storeLowestMemReaderOffset(e) > READ_AHEAD_GAP)
+    if (mem->inmem_hi - storeLowestMemReaderOffset(e) > READ_AHEAD_GAP) {
 	EBIT_SET(e->flags, ENTRY_DEFER_READ);
 	return 1;
+    }
     return rc;
 }