summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornelsonb%netscape.com <devnull@localhost>2001-06-09 19:30:21 +0000
committernelsonb%netscape.com <devnull@localhost>2001-06-09 19:30:21 +0000
commitcfc2e31446d0d40b54b6caf5173b433b56bbcbca (patch)
tree8b4776c3be68a536622dd0e5f44658946cc4b4ab
parent3013655651a874ce4ff16545e9f8984442a77f22 (diff)
downloadnss-hg-cfc2e31446d0d40b54b6caf5173b433b56bbcbca.tar.gz
Fix two bugs found in nightly QA. On Solaris/x86, don't assert that the
sid cache entry is a multiple of 8 bytes long. On OSF1, reduce the maximum number of POSIX semaphores so it doesn't exceed the per-process limit of 256.
-rw-r--r--security/nss/lib/ssl/sslsnce.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index 64346db64..11e03e737 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -234,7 +234,9 @@ static PRBool isMultiProcess = PR_FALSE;
#define MIN_SSL3_TIMEOUT 5 /* seconds */
#if defined(AIX) || defined(LINUX)
-#define MAX_SID_CACHE_LOCKS 8
+#define MAX_SID_CACHE_LOCKS 8 /* two FDs per lock */
+#elif defined(OSF1)
+#define MAX_SID_CACHE_LOCKS 16 /* one FD per lock */
#else
#define MAX_SID_CACHE_LOCKS 256
#endif
@@ -1037,8 +1039,12 @@ SSL_ConfigServerSessionIDCacheInstance( cacheDesc *cache,
{
SECStatus rv;
-/* printf("sizeof(sidCacheEntry) == %u\n", sizeof(sidCacheEntry)); */
+#if defined(DEBUG_nelsonb)
+ printf("sizeof(sidCacheEntry) == %u\n", sizeof(sidCacheEntry));
+#endif
+#if !(defined(SOLARIS) && defined(i386))
PORT_Assert(sizeof(sidCacheEntry) % 8 == 0);
+#endif
PORT_Assert(sizeof(certCacheEntry) == 4096);
myPid = SSL_GETPID();