rpms/mod_nss/F-8 mod_nss-kill.patch, NONE, 1.1 mod_nss.spec, 1.12, 1.13

[Robert Crittenden (rcritten)]

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30474

Modified Files:
	mod_nss.spec 
Added Files:
	mod_nss-kill.patch 
Log Message:
- Don't force module de-init during the configuration stage (453508)

Resolves: #453508


mod_nss-kill.patch:

--- NEW FILE mod_nss-kill.patch ---
--- mod_nss-1.0.7.orig/nss_engine_init.c   14 Jul 2008 20:25:53 -0000      1.33
+++ mod_nss-1.0.7/nss_engine_init.c   14 Jul 2008 20:28:13 -0000
+++ nss_engine_init.c   14 Jul 2008 20:35:34 -0000
@@ -315,6 +315,13 @@
 
     mc->nInitCount++;
 
+    /* 
+     * Let us cleanup on restarts and exists
+     */
+    apr_pool_cleanup_register(p, base_server,
+                              nss_init_ModuleKill,
+                              apr_pool_cleanup_null);
+
     mc->ptemp = ptemp;
  
     /*
@@ -491,9 +498,6 @@
              */
             nss_init_ConfigureServer(s, p, ptemp, sc);
         }
-
-        nss_init_ChildKill(base_server);
-        nss_init_ModuleKill(base_server);
     }
 
     /*
@@ -1144,12 +1148,16 @@
 apr_status_t nss_init_ModuleKill(void *data)
 {
     server_rec *base_server = (server_rec *)data;
+    SSLModConfigRec *mc = myModConfig(base_server);
 
     ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server,
         "Shutting down SSL Session ID Cache");
 
     SSL_ShutdownServerSessionIDCache();
 
+    if (mc->nInitCount == 1)
+        nss_init_ChildKill(base_server);
+
     /* NSS_Shutdown() gets called in nss_init_ChildKill */
     return APR_SUCCESS;
 }


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/F-8/mod_nss.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_nss.spec	11 Jul 2008 12:43:22 -0000	1.12
+++ mod_nss.spec	16 Jul 2008 15:17:46 -0000	1.13
@@ -1,6 +1,6 @@
 Name: mod_nss
 Version: 1.0.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
@@ -17,6 +17,7 @@
 Patch4: mod_nss-nofork.patch
 Patch5: mod_nss-fips.patch
 Patch6: mod_nss-inherit.patch
+Patch7: mod_nss-kill.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -32,6 +33,7 @@
 %patch4 -p1 -b .nofork
 %patch5 -p1 -b .fips
 %patch6 -p1 -b .inherit
+%patch7 -p1 -b .kill
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -116,6 +118,9 @@
 %{_sbindir}/gencert
 
 %changelog
+* Mon Jul 14 2008 Rob Crittenden <rcritten at redhat.com> - 1.0.7-8
+- Don't force module de-init during the configuration stage (453508)
+
 * Thu Jul 10 2008 Rob Crittenden <rcritten at redhat.com> - 1.0.7-7
 - Don't inherit the MP cache in multi-threaded mode (454701)
 - Don't initialize NSS in each child if SSL isn't configured