Commit 28a897db authored by Joe Orton's avatar Joe Orton
Browse files

* modules/ssl/ssl_scache.c (ssl_scache_expire): Remove unused function. 

* modules/ssl/ssl_scache_dc.c (ssl_scache_dc_expire): Likewise.

* modules/ssl/ssl_scache_shmcb.c (ssl_scache_shmcb_expire): Likewise.

* modules/ssl/ssl_scache_dbm.c (ssl_scache_dbm_expire): Make static.

* modules/ssl/ssl_private.h: Remove prototypes.


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

ssl_private.h

+0 −4
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ void ssl_scache_kill(server_rec *); 
BOOL         ssl_scache_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);

SSL_SESSION *ssl_scache_retrieve(server_rec *, UCHAR *, int);

void         ssl_scache_remove(server_rec *, UCHAR *, int);

void         ssl_scache_expire(server_rec *);



char        *ssl_scache_id2sz(UCHAR *, int);

void         ssl_scache_dbm_init(server_rec *, apr_pool_t *);
@@ -554,7 +553,6 @@ void ssl_scache_dbm_kill(server_rec *); 
BOOL         ssl_scache_dbm_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);

SSL_SESSION *ssl_scache_dbm_retrieve(server_rec *, UCHAR *, int);

void         ssl_scache_dbm_remove(server_rec *, UCHAR *, int);

void         ssl_scache_dbm_expire(server_rec *);

void         ssl_scache_dbm_status(request_rec *r, int flags, apr_pool_t *pool);



void         ssl_scache_shmcb_init(server_rec *, apr_pool_t *);
@@ -562,7 +560,6 @@ void ssl_scache_shmcb_kill(server_rec *); 
BOOL         ssl_scache_shmcb_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);

SSL_SESSION *ssl_scache_shmcb_retrieve(server_rec *, UCHAR *, int);

void         ssl_scache_shmcb_remove(server_rec *, UCHAR *, int);

void         ssl_scache_shmcb_expire(server_rec *);

void         ssl_scache_shmcb_status(request_rec *r, int flags, apr_pool_t *pool);



void         ssl_scache_dc_init(server_rec *, apr_pool_t *);
@@ -570,7 +567,6 @@ void ssl_scache_dc_kill(server_rec *); 
BOOL         ssl_scache_dc_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);

SSL_SESSION *ssl_scache_dc_retrieve(server_rec *, UCHAR *, int);

void         ssl_scache_dc_remove(server_rec *, UCHAR *, int);

void         ssl_scache_dc_expire(server_rec *);

void         ssl_scache_dc_status(request_rec *r, int flags, apr_pool_t *pool);



/* Proxy Support */

ssl_scache.c

+0 −11
Original line number Diff line number Diff line
@@ -134,17 +134,6 @@ void ssl_scache_remove(server_rec *s, UCHAR *id, int idlen) 
    return;

}



void ssl_scache_expire(server_rec *s)

{

    SSLModConfigRec *mc = myModConfig(s);



    if (mc->nSessionCacheMode == SSL_SCMODE_DBM)

        ssl_scache_dbm_expire(s);

    else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)

        ssl_scache_shmcb_expire(s);

    return;

}



/*  _________________________________________________________________

**

**  SSL Extension to mod_status

ssl_scache_dbm.c

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 


#include "ssl_private.h"



static void ssl_scache_dbm_expire(server_rec *s);



void ssl_scache_dbm_init(server_rec *s, apr_pool_t *p)

{

    SSLModConfigRec *mc = myModConfig(s);
@@ -288,7 +290,7 @@ void ssl_scache_dbm_remove(server_rec *s, UCHAR *id, int idlen) 
    return;

}



void ssl_scache_dbm_expire(server_rec *s)

static void ssl_scache_dbm_expire(server_rec *s)

{

    SSLModConfigRec *mc = myModConfig(s);

    SSLSrvConfigRec *sc = mySrvConfig(s);

ssl_scache_dc.c

+0 −6
Original line number Diff line number Diff line
@@ -162,12 +162,6 @@ void ssl_scache_dc_remove(server_rec *s, UCHAR *id, int idlen) 
    }

}



void ssl_scache_dc_expire(server_rec *s)

{

    /* NOP */

    return;

}



void ssl_scache_dc_status(request_rec *r, int flags, apr_pool_t *pool)

{

    SSLModConfigRec *mc = myModConfig(r->server);

ssl_scache_shmcb.c

+0 −6
Original line number Diff line number Diff line
@@ -443,12 +443,6 @@ void ssl_scache_shmcb_remove(server_rec *s, UCHAR *id, int idlen) 
    ssl_mutex_off(s);

}



void ssl_scache_shmcb_expire(server_rec *s)

{

    /* NOP */

    return;

}



void ssl_scache_shmcb_status(request_rec *r, int flags, apr_pool_t *p)

{

    SSLModConfigRec *mc = myModConfig(r->server);