[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 70/156: 200855

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit 78964301c833be4c91a5a1511a5469f5d54cead3
Author: rcritten <>
Date:   Wed Aug 2 18:59:12 2006 +0000

    200855
    
    Turns out I didn't need to defer startup at all, the LogLevel in nss.conf
    was enough. I actually had the compare reversed anyway, but that was
    the least of the problem. 30% of the time the server would core during
    shutdown due to a race condition.
---
 nss_engine_init.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/nss_engine_init.c b/nss_engine_init.c
index d265e83..e09b077 100644
--- a/nss_engine_init.c
+++ b/nss_engine_init.c
@@ -969,9 +969,7 @@ static void nss_init_proxy_ctx(server_rec *s,
 
     nss_init_ctx(s, p, ptemp, sc->proxy);
 
-    /* Only try to load the certificates once the server is up */
-    if (mc->nInitCount < 2)
-        nss_init_server_certs(s, p, ptemp, sc->proxy);
+    nss_init_server_certs(s, p, ptemp, sc->proxy);
 }
 
 static void nss_init_server_ctx(server_rec *s,
@@ -985,9 +983,7 @@ static void nss_init_server_ctx(server_rec *s,
 
     nss_init_ctx(s, p, ptemp, sc->server);
 
-    /* Only try to load the certificates once the server is up */
-    if (mc->nInitCount < 2)
-        nss_init_server_certs(s, p, ptemp, sc->server);
+    nss_init_server_certs(s, p, ptemp, sc->server);
 }
 
 /*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git