Commit 811b30cc authored by Joe Orton's avatar Joe Orton
Browse files

Remove shmht session cache in favour of shmcb; shmht has had 

data corruption bugs since being apr_rmm'ified.

* config.m4, mod_ssl.dsp: Don't build ssl_util_table and
ssl_scache_shmht.

* ssl_util_table.h, ssl_util_table.c, ssl_scache_shmht.c: Removed
files.

* mod_ssl.h (SSLModConfigRec): Use a void * pointer for storing
the scache-specific data.

* ssl_engine_config.c (ssl_cmd_SSLSessionCache): Treat shmht: as
shmcb:.

* ssl_scache.c: Remove shmht hooks throughout.

* ssl_scache_shmcb.c: Remove casts to use the table_t * pointer as a
void *.


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

config.m4

+0 −2
Original line number Diff line number Diff line
@@ -69,10 +69,8 @@ ssl_expr_scan.lo dnl 
ssl_scache.lo dnl

ssl_scache_dbm.lo dnl

ssl_scache_shmcb.lo dnl

ssl_scache_shmht.lo dnl

ssl_util.lo dnl

ssl_util_ssl.lo dnl

ssl_util_table.lo dnl

"

dnl #  hook module into the Autoconf mechanism (--enable-ssl option)

APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [

mod_ssl.dsp

+0 −9
Original line number Diff line number Diff line
@@ -164,10 +164,6 @@ SOURCE=.\ssl_scache_shmcb.c 
# End Source File

# Begin Source File



SOURCE=.\ssl_scache_shmht.c

# End Source File

# Begin Source File



SOURCE=.\ssl_util.c

# End Source File

# Begin Source File
@@ -176,11 +172,6 @@ SOURCE=.\ssl_util_ssl.c 
# End Source File

# Begin Source File



SOURCE=.\ssl_util_table.c

# End Source File

# End Group

# Begin Group "Header Files"



# PROP Default_Filter "*.h"

# Begin Source File

mod_ssl.h

+1 −3
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ 
#include "ssl_toolkit_compat.h"

#include "ssl_expr.h"

#include "ssl_util_ssl.h"

#include "ssl_util_table.h"



/* The #ifdef macros are only defined AFTER including the above

 * therefore we cannot include these system files at the top  :-(
@@ -307,7 +306,6 @@ typedef enum { 
    SSL_SCMODE_UNSET = UNSET,

    SSL_SCMODE_NONE  = 0,

    SSL_SCMODE_DBM   = 1,

    SSL_SCMODE_SHMHT = 2,

    SSL_SCMODE_SHMCB = 3

} ssl_scmode_t;
@@ -391,7 +389,7 @@ typedef struct { 
    int             nSessionCacheDataSize;

    apr_shm_t      *pSessionCacheDataMM;

    apr_rmm_t      *pSessionCacheDataRMM;

    apr_table_t    *tSessionCacheDataTable;

    void           *tSessionCacheDataTable;

    ssl_mutexmode_t nMutexMode;

    apr_lockmech_e  nMutexMech;

    const char     *szMutexFile;

ssl_engine_config.c

+1 −41
Original line number Diff line number Diff line
@@ -1006,48 +1006,8 @@ const char *ssl_cmd_SSLSessionCache(cmd_parms *cmd, 
                                arg+4);

        }

    }

    else if ((arglen > 6) && strcEQn(arg, "shmht:", 6)) {

#if !APR_HAS_SHARED_MEMORY

        return MODSSL_NO_SHARED_MEMORY_ERROR;

#endif

        mc->nSessionCacheMode = SSL_SCMODE_SHMHT;

        colon = ap_strchr_c(arg, ':');

        mc->szSessionCacheDataFile =

            ap_server_root_relative(mc->pPool, colon+1);

        if (!mc->szSessionCacheDataFile) {

            return apr_psprintf(cmd->pool,

                                "SSLSessionCache: Invalid cache file path %s",

                                colon+1);

        }

        mc->tSessionCacheDataTable = NULL;

        mc->nSessionCacheDataSize  = 1024*512; /* 512KB */



        if ((cp = strchr(mc->szSessionCacheDataFile, '('))) {

            *cp++ = NUL;



            if (!(cp2 = strchr(cp, ')'))) {

                return "SSLSessionCache: Invalid argument: "

                       "no closing parenthesis";

            }



            *cp2 = NUL;



            mc->nSessionCacheDataSize = atoi(cp);



            if (mc->nSessionCacheDataSize < 8192) {

                return "SSLSessionCache: Invalid argument: "

                       "size has to be >= 8192 bytes";

            }



            if (mc->nSessionCacheDataSize >= APR_SHM_MAXSIZE) {

                return apr_psprintf(cmd->pool,

                                    "SSLSessionCache: Invalid argument: "

                                    "size has to be < %d bytes on this "

                                    "platform", APR_SHM_MAXSIZE);

            }

        }

    }

    else if (((arglen > 4) && strcEQn(arg, "shm:", 4)) ||

             ((arglen > 6) && strcEQn(arg, "shmht:", 6)) ||

             ((arglen > 6) && strcEQn(arg, "shmcb:", 6))) {

#if !APR_HAS_SHARED_MEMORY

        return MODSSL_NO_SHARED_MEMORY_ERROR;

ssl_scache.c

+2 −18
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p) 


    if (mc->nSessionCacheMode == SSL_SCMODE_DBM)

        ssl_scache_dbm_init(s, p);

    else if ((mc->nSessionCacheMode == SSL_SCMODE_SHMHT) ||

             (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)) {

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB) {

        void *data;

        const char *userdata_key = "ssl_scache_init";
@@ -98,9 +97,6 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p) 
                                  apr_pool_cleanup_null, s->process->pool);

            return;

        }

        if (mc->nSessionCacheMode == SSL_SCMODE_SHMHT)

            ssl_scache_shmht_init(s, p);

        else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)

        ssl_scache_shmcb_init(s, p);

    }

}
@@ -111,8 +107,6 @@ void ssl_scache_kill(server_rec *s) 


    if (mc->nSessionCacheMode == SSL_SCMODE_DBM)

        ssl_scache_dbm_kill(s);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMHT)

        ssl_scache_shmht_kill(s);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)

        ssl_scache_shmcb_kill(s);

    return;
@@ -125,8 +119,6 @@ BOOL ssl_scache_store(server_rec *s, UCHAR *id, int idlen, time_t expiry, SSL_SE 


    if (mc->nSessionCacheMode == SSL_SCMODE_DBM)

        rv = ssl_scache_dbm_store(s, id, idlen, expiry, sess);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMHT)

        rv = ssl_scache_shmht_store(s, id, idlen, expiry, sess);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)

        rv = ssl_scache_shmcb_store(s, id, idlen, expiry, sess);

    return rv;
@@ -139,8 +131,6 @@ SSL_SESSION *ssl_scache_retrieve(server_rec *s, UCHAR *id, int idlen) 


    if (mc->nSessionCacheMode == SSL_SCMODE_DBM)

        sess = ssl_scache_dbm_retrieve(s, id, idlen);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMHT)

        sess = ssl_scache_shmht_retrieve(s, id, idlen);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)

        sess = ssl_scache_shmcb_retrieve(s, id, idlen);

    return sess;
@@ -152,8 +142,6 @@ void ssl_scache_remove(server_rec *s, UCHAR *id, int idlen) 


    if (mc->nSessionCacheMode == SSL_SCMODE_DBM)

        ssl_scache_dbm_remove(s, id, idlen);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMHT)

        ssl_scache_shmht_remove(s, id, idlen);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)

        ssl_scache_shmcb_remove(s, id, idlen);

    return;
@@ -165,8 +153,6 @@ void ssl_scache_status(server_rec *s, apr_pool_t *p, void (*func)(char *, void * 


    if (mc->nSessionCacheMode == SSL_SCMODE_DBM)

        ssl_scache_dbm_status(s, p, func, arg);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMHT)

        ssl_scache_shmht_status(s, p, func, arg);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)

        ssl_scache_shmcb_status(s, p, func, arg);

    return;
@@ -178,8 +164,6 @@ void ssl_scache_expire(server_rec *s) 


    if (mc->nSessionCacheMode == SSL_SCMODE_DBM)

        ssl_scache_dbm_expire(s);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMHT)

        ssl_scache_shmht_expire(s);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)

        ssl_scache_shmcb_expire(s);

    return;