diff options
author | rcritten <> | 2006-10-30 21:12:37 +0000 |
---|---|---|
committer | rcritten <> | 2006-10-30 21:12:37 +0000 |
commit | ff38e91d0bfa650b5ab77378f583243cabcddf0d (patch) | |
tree | 0ad077796682e710350e28cfb91f6f72ef29ca45 | |
parent | 9a894d91ad38f3b71fa2380b383005372ce3e2f8 (diff) | |
download | mod_nss-ff38e91d0bfa650b5ab77378f583243cabcddf0d.tar.gz mod_nss-ff38e91d0bfa650b5ab77378f583243cabcddf0d.tar.xz mod_nss-ff38e91d0bfa650b5ab77378f583243cabcddf0d.zip |
213081
The way I was using to detect the model being used was incorrect. Now
use the # of threads available. Guaranteed to be 0 for prefork and > 0 for
worker (threaded)
-rw-r--r-- | nss_engine_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nss_engine_init.c b/nss_engine_init.c index fa5cd68..c61a11e 100644 --- a/nss_engine_init.c +++ b/nss_engine_init.c @@ -142,7 +142,7 @@ static void nss_init_SSLLibrary(server_rec *s, int fipsenabled, SECStatus rv; SSLModConfigRec *mc = myModConfig(s); SSLSrvConfigRec *sc; - int forked = 0; + int threaded = 0; char cwd[PATH_MAX]; sc = mySrvConfig(s); @@ -207,8 +207,8 @@ static void nss_init_SSLLibrary(server_rec *s, int fipsenabled, ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Initializing SSL Session Cache of size %d. SSL2 timeout = %d, SSL3/TLS timeout = %d.", mc->session_cache_size, mc->session_cache_timeout, mc->ssl3_session_cache_timeout); - ap_mpm_query(AP_MPMQ_IS_FORKED, &forked); - if (forked) + ap_mpm_query(AP_MPMQ_MAX_THREADS, &threaded); + if (!threaded) SSL_ConfigMPServerSIDCache(mc->session_cache_size, (PRUint32) mc->session_cache_timeout, (PRUint32) mc->ssl3_session_cache_timeout, NULL); else SSL_ConfigServerSessionIDCache(mc->session_cache_size, (PRUint32) mc->session_cache_timeout, (PRUint32) mc->ssl3_session_cache_timeout, NULL); |