Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30573
Modified Files:
nss_engine_init.c
Log Message:
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)
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nss_engine_init.c 26 Oct 2006 18:59:24 -0000 1.26
+++ nss_engine_init.c 30 Oct 2006 21:12:37 -0000 1.27
@@ -142,7 +142,7 @@
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 @@
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);
Show replies by date