Modify post_config hook so that it can return a error,

causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully

PR:
Obtained from:
Submitted by:
Reviewed by:	(Idea only Jeff Trawick)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@92144 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/mod_ssl.h b/mod_ssl.h
index 9634499049b9d10d8ce658f8479210dc7d6d0753..8bd0c71b8a5bbbea6891169f35607452138bb5d4 100644 (file)
--- a/mod_ssl.h
+++ b/mod_ssl.h
@@ -605,7 +605,7 @@ const char  *ssl_cmd_SSLProxyMachineCertificateFile(cmd_parms *, char *, char *)
 #endif
 
 /*  module initialization  */
-void         ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);
+int          ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);
 void         ssl_init_SSLLibrary(void);
 void         ssl_init_Engine(server_rec *, apr_pool_t *);
 void         ssl_init_TmpKeysHandle(int, server_rec *, apr_pool_t *);

diff --git a/ssl_engine_init.c b/ssl_engine_init.c
index 02c68b9d6035a21c39e65f553a82db3296f7c8b1..cbb86d1f7aefb817da302dcde7cc2c9d4c2be49b 100644 (file)
--- a/ssl_engine_init.c
+++ b/ssl_engine_init.c
@@ -70,7 +70,7 @@
 /*
  *  Per-module initialization
  */
-void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
+int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
     apr_pool_t *ptemp, server_rec *s)
 {
     SSLModConfigRec *mc = myModConfig(s);
@@ -191,7 +191,7 @@ void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
     if (mc->nInitCount == 1) {
         ssl_pphrase_Handle(s, p);
         ssl_init_TmpKeysHandle(SSL_TKP_GEN, s, p);
-        return;
+        return OK;
     }
 
     /*
@@ -265,7 +265,7 @@ void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
     ap_add_version_component(p, ssl_var_lookup(p, s, NULL, NULL, "SSL_VERSION_LIBRARY"));
 
     SSL_init_app_data2_idx(); /* for SSL_get_app_data2() at request time */
-    return;
+    return OK;
 }
 
 /*