[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 120/156: No need to shut things down if NSS isn't initialized.

[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 78fe734c6e0cbf4adf602604b3018954b259cc0f
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Tue Jun 14 22:19:23 2011 -0400

    No need to shut things down if NSS isn't initialized.
    
    Patch contributed by Ulf Weltman
    
    BZ 618466
---
 nss_engine_init.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nss_engine_init.c b/nss_engine_init.c
index 6b0770c..6d69624 100644
--- a/nss_engine_init.c
+++ b/nss_engine_init.c
@@ -1218,6 +1218,10 @@ apr_status_t nss_init_ModuleKill(void *data)
     server_rec *base_server = (server_rec *)data;
     SSLModConfigRec *mc = myModConfig(base_server);
 
+    if (!NSS_IsInitialized()) {
+        return APR_SUCCESS;
+    }
+
     ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server,
         "Shutting down SSL Session ID Cache");
 

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