mod_session_crypto: Initialise SSL in the post config hook.

minfrin · minfrin · commit d59fd020acea · 2008-04-06T14:23:35.000Z
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645244 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) mod_session_crypto: Initialise SSL in the post config hook.
+     [Ruediger Pluem, Graham Leggett]
+
   *) mod_session_dbd: Add a session implementation capable of storing
      session information in a SQL database via the dbd interface. Useful
      for sites where session privacy is important. [Graham Leggett]
diff --git a/modules/session/mod_session_crypto.c b/modules/session/mod_session_crypto.c
@@ -316,6 +316,15 @@ AP_DECLARE(int) ap_session_crypto_decode(request_rec * r, session_rec * z)
 
 }
 
+/**
+ * Initialise the SSL in the post_config hook.
+ */
+AP_DECLARE(int) ap_session_crypto_init(apr_pool_t *p, apr_pool_t *plog,
+                                       apr_pool_t *ptemp, server_rec *s)
+{
+    apr_ssl_init();
+    return OK;
+}
 
 
 
@@ -328,9 +337,6 @@ static void *create_session_crypto_dir_config(apr_pool_t * p, char *dummy)
     new->cipher = DEFAULT_CIPHER;
     new->digest = DEFAULT_DIGEST;
 
-    /* initialise SSL */
-    apr_ssl_init();
-
     return (void *) new;
 }
 
@@ -453,6 +459,7 @@ static void register_hooks(apr_pool_t * p)
 {
     ap_hook_session_encode(ap_session_crypto_encode, NULL, NULL, APR_HOOK_LAST);
     ap_hook_session_decode(ap_session_crypto_decode, NULL, NULL, APR_HOOK_FIRST);
+    ap_hook_post_config(ap_session_crypto_init, NULL, NULL, APR_HOOK_FIRST);
 }
 
 module AP_MODULE_DECLARE_DATA session_crypto_module =

Original file line number	Diff line number	Diff line change
`@@ -316,6 +316,15 @@ AP_DECLARE(int) ap_session_crypto_decode(request_rec * r, session_rec * z)`
`316`	`316`
`317`	`317`	`}`
`318`	`318`
	`319`	`+/**`
	`320`	`+ * Initialise the SSL in the post_config hook.`
	`321`	`+ */`
	`322`	`+AP_DECLARE(int) ap_session_crypto_init(apr_pool_t p, apr_pool_t plog,`
	`323`	`+ apr_pool_t ptemp, server_rec s)`
	`324`	`+{`
	`325`	`+ apr_ssl_init();`
	`326`	`+ return OK;`
	`327`	`+}`
`319`	`328`
`320`	`329`
`321`	`330`
`@@ -328,9 +337,6 @@ static void create_session_crypto_dir_config(apr_pool_t p, char *dummy)`
`328`	`337`	`new->cipher = DEFAULT_CIPHER;`
`329`	`338`	`new->digest = DEFAULT_DIGEST;`
`330`	`339`
`331`		`- /* initialise SSL */`
`332`		`- apr_ssl_init();`
`333`		`-`
`334`	`340`	`return (void *) new;`
`335`	`341`	`}`
`336`	`342`
`@@ -453,6 +459,7 @@ static void register_hooks(apr_pool_t * p)`
`453`	`459`	`{`
`454`	`460`	`ap_hook_session_encode(ap_session_crypto_encode, NULL, NULL, APR_HOOK_LAST);`
`455`	`461`	`ap_hook_session_decode(ap_session_crypto_decode, NULL, NULL, APR_HOOK_FIRST);`
	`462`	`+ ap_hook_post_config(ap_session_crypto_init, NULL, NULL, APR_HOOK_FIRST);`
`456`	`463`	`}`
`457`	`464`
`458`	`465`	`module AP_MODULE_DECLARE_DATA session_crypto_module =`