Make sure OCSP Stapling Mutex is initiliased if we need it.

PR 49498

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

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 6c4b791419437bc4db7cc59d5ffef7cc970b8ee6..4a4bd6b7764d5fa3bb569bde48f0049478b52c10 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -319,10 +319,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
         return HTTP_INTERNAL_SERVER_ERROR;
     }
 #ifdef HAVE_OCSP_STAPLING
-    if (!ssl_stapling_mutex_init(base_server, p)) {
-        return HTTP_INTERNAL_SERVER_ERROR;
-    }
-
     ssl_stapling_ex_init();
 #endif
 

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index abf34a223ba2e787e9d4996ec6de91cf0e1c4fc4..4e8714c732f53c15c10ba4e50d41db3e35aae67d 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -723,7 +723,6 @@ int          ssl_mutex_reinit(server_rec *, apr_pool_t *);
 int          ssl_mutex_on(server_rec *);
 int          ssl_mutex_off(server_rec *);
 
-int          ssl_stapling_mutex_init(server_rec *, apr_pool_t *);
 int          ssl_stapling_mutex_reinit(server_rec *, apr_pool_t *);
 
 /* mutex type names for Mutex directive */

diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c
index 0f781f60c237abe08c3885dd3869507f55ac3091..ca47b8e4191b92bdc2b841b27bc4bddd8e777583 100644 (file)
--- a/modules/ssl/ssl_util_stapling.c
+++ b/modules/ssl/ssl_util_stapling.c
@@ -471,7 +471,7 @@ err:
  * SSLStaplingMutex operations. Similar to SSL mutex except a mutex is
  * mandatory if stapling is enabled.
  */
-int ssl_stapling_mutex_init(server_rec *s, apr_pool_t *p)
+static int ssl_stapling_mutex_init(server_rec *s, apr_pool_t *p)
 {
     SSLModConfigRec *mc = myModConfig(s);
     SSLSrvConfigRec *sc = mySrvConfig(s);
@@ -657,6 +657,11 @@ void modssl_init_stapling(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp,
                      "SSLStapling: no stapling cache available");
         ssl_die();
     }
+    if (ssl_stapling_mutex_init(s, ptemp) == FALSE) {
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+                     "SSLStapling: cannot initialise stapling mutex");
+        ssl_die();
+    }
     /* Set some default values for parameters if they are not set */
     if (mctx->stapling_resptime_skew == UNSET) {
         mctx->stapling_resptime_skew = 60 * 5;