diff options
| author | Wan-Teh Chang <wtc@google.com> | 2013-09-25 17:05:03 -0700 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2013-09-25 17:05:03 -0700 |
| commit | 268556a874f148cdbfa4c348cd784f22cdc9a2e5 (patch) | |
| tree | 10c9abd3e4116a691f9a847b6206a87d95293f69 /lib/ssl/sslsnce.c | |
| parent | f2349c3b4d88ed8fa1d12a957cf7aa2c9a6666f8 (diff) | |
| download | nss-hg-268556a874f148cdbfa4c348cd784f22cdc9a2e5.tar.gz | |
Bug 764646: Backed out changeset 4bb4712d7432 because selfserv calls
SSL_ConfigServerSessionIDCache, which ultimately calls
NSS_RegisterShutdown, before calling NSS_Initialize.
Diffstat (limited to 'lib/ssl/sslsnce.c')
| -rw-r--r-- | lib/ssl/sslsnce.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/sslsnce.c b/lib/ssl/sslsnce.c index 34e07b005..b0446adc1 100644 --- a/lib/ssl/sslsnce.c +++ b/lib/ssl/sslsnce.c @@ -1353,7 +1353,7 @@ SSL_ConfigServerSessionIDCache( int maxCacheEntries, PRUint32 ssl3_timeout, const char * directory) { - ssl_InitSessionCacheLocks(); + ssl_InitSessionCacheLocks(PR_FALSE); return SSL_ConfigServerSessionIDCacheInstance(&globalCache, maxCacheEntries, ssl2_timeout, ssl3_timeout, directory, PR_FALSE); } @@ -1467,7 +1467,7 @@ SSL_ConfigServerSessionIDCacheWithOpt( PRBool enableMPCache) { if (!enableMPCache) { - ssl_InitSessionCacheLocks(); + ssl_InitSessionCacheLocks(PR_FALSE); return ssl_ConfigServerSessionIDCacheInstanceWithOpt(&globalCache, ssl2_timeout, ssl3_timeout, directory, PR_FALSE, maxCacheEntries, maxCertCacheEntries, maxSrvNameCacheEntries); @@ -1512,7 +1512,7 @@ SSL_InheritMPServerSIDCacheInstance(cacheDesc *cache, const char * envString) return SECSuccess; /* already done. */ } - ssl_InitSessionCacheLocks(); + ssl_InitSessionCacheLocks(PR_FALSE); ssl_sid_lookup = ServerSessionIDLookup; ssl_sid_cache = ServerSessionIDCache; |