move warning about session cache not being configured to ssl_scache_init

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

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index da9d40d41c4f7e612e10f2c6abe9d92e8cc004db..8d8b8b352b7814725406a553342e1e111740ec9a 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -271,17 +271,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
     ssl_init_Engine(base_server, p);
 #endif
 
-    /*
-     * Warn the user that he should use the session cache.
-     * But we can operate without it, of course.
-     */
-    if (mc->nSessionCacheMode == SSL_SCMODE_UNSET) {
-        ssl_log(base_server, SSL_LOG_WARN,
-                "Init: Session Cache is not configured "
-                "[hint: SSLSessionCache]");
-        mc->nSessionCacheMode = SSL_SCMODE_NONE;
-    }
-
     /*
      * initialize the mutex handling
      */

diff --git a/modules/ssl/ssl_scache.c b/modules/ssl/ssl_scache.c
index 839add7a62b8e2cb5942fb32e52789c7249465d4..df7567df782c72e2da116a05b45f642120e94750 100644 (file)
--- a/modules/ssl/ssl_scache.c
+++ b/modules/ssl/ssl_scache.c
@@ -73,6 +73,18 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p)
 {
     SSLModConfigRec *mc = myModConfig(s);
 
+    /*
+     * Warn the user that he should use the session cache.
+     * But we can operate without it, of course.
+     */
+    if (mc->nSessionCacheMode == SSL_SCMODE_UNSET) {
+        ssl_log(s, SSL_LOG_WARN,
+                "Init: Session Cache is not configured "
+                "[hint: SSLSessionCache]");
+        mc->nSessionCacheMode = SSL_SCMODE_NONE;
+        return;
+    }
+
     if (mc->nSessionCacheMode == SSL_SCMODE_DBM)
         ssl_scache_dbm_init(s, p);
     else if ((mc->nSessionCacheMode == SSL_SCMODE_SHMHT) ||
@@ -91,7 +103,6 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p)
         else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
             ssl_scache_shmcb_init(s, p);
     }
-    return;
 }
 
 void ssl_scache_kill(server_rec *s)