Commit 178d0d75 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

move warning about session cache not being configured to ssl_scache_init 


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

ssl_engine_init.c

+0 −11
Changes for ssl_engine_init.c: 0 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -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

     */

ssl_scache.c

+12 −1
Changes for ssl_scache.c: 12 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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)