From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 22 Dec 2011 07:23:50 +0000 (-0700)
Subject: Bug 3413: raise cbdata lock limits
X-Git-Tag: SQUID_3_2_0_15~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f556332d847cf2d6d6a0348e72665d9bd34ae957;p=thirdparty%2Fsquid.git

Bug 3413: raise cbdata lock limits

In 3.2 it is now possible to have >64K simultaneous connections
referencing some permanent cbdata locked state (port, peer, acl etc)
---

diff --git a/src/cbdata.cc b/src/cbdata.cc
index 72c0617b98..cc92cd0c07 100644
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -108,7 +108,7 @@ public:
 
     ~cbdata();
     int valid;
-    int locks;
+    int32_t locks;
     cbdata_type type;
 #if USE_CBDATA_DEBUG
 
@@ -419,7 +419,7 @@ cbdataInternalLock(const void *p)
 
     c->check(__LINE__);
 
-    assert(c->locks < 65535);
+    assert(c->locks < INT_MAX);
 
     c->locks++;
 }