Attachment 311426 Details for Bug 454701 – patch

[patch] patch

mod_nss-mpserver.patch (text/plain), 2.03 KB, created by Rich Megginson on 2008-07-09 22:40:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-07-09 22:40:22 UTC

Size: 2.03 KB

patch

obsolete

>Index: nss_engine_init.c
>===================================================================
>RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
>retrieving revision 1.32
>diff -u -8 -r1.32 nss_engine_init.c
>--- nss_engine_init.c	16 May 2008 15:16:02 -0000	1.32
>+++ nss_engine_init.c	9 Jul 2008 22:22:46 -0000
>@@ -1079,23 +1079,54 @@
>     }
> }
> 
> void nss_init_Child(apr_pool_t *p, server_rec *base_server)
> {
>     SSLModConfigRec *mc = myModConfig(base_server);
>     SSLSrvConfigRec *sc;
>     server_rec *s;
>+    int threaded = 0;
>+    int sslenabled = FALSE;
> 
>     mc->pid = getpid(); /* only call getpid() once per-process */
> 
>-    if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) {
>-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
>-             "SSL_InheritMPServerSIDCache failed");
>-        nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL);
>+    /*
>+     *  First, see if ssl is enabled at all
>+     */
>+    for (s = base_server; s; s = s->next) {
>+        sc = mySrvConfig(s);
>+        /* If any servers have SSL, we want sslenabled set so we
>+         * can perform further initialization
>+         */
>+
>+        if (sc->enabled == UNSET) {
>+            sc->enabled = FALSE;
>+        }
>+
>+        if (sc->proxy_enabled == UNSET) {
>+            sc->proxy_enabled = FALSE;
>+        }
>+
>+        if ((sc->enabled == TRUE) || (sc->proxy_enabled == TRUE)) {
>+            sslenabled = TRUE;
>+        }
>+    }
>+
>+    if (sslenabled == FALSE) { /* we are not an SSL/TLS server */
>+        return;
>+    }
>+
>+    ap_mpm_query(AP_MPMQ_MAX_THREADS, &threaded);
>+    if (!threaded) {
>+        if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) {
>+            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
>+                         "SSL_InheritMPServerSIDCache failed");
>+            nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL);
>+        }
>     }
> 
>     nss_init_SSLLibrary(base_server);
> 
>     /* Configure all virtual servers */
>     for (s = base_server; s; s = s->next) {
>         sc = mySrvConfig(s);
>         if (sc->server->servercert == NULL && NSS_IsInitialized())

Actions: View | Diff

Attachments on bug 454701: 311426