* 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@103793 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 80a4c7efa017139b8ccbccd0534ea1b7e2e7a3a2..f8e9d1d8e5bd6d237907c232b7fa01516ab7a5b6 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -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 */

diff --git a/modules/ssl/ssl_scache.c b/modules/ssl/ssl_scache.c
index fee449888d013d20b50a433da92d14c54684d7bb..2d787a268e1afa3f6b84f6f8449a7d679f2bc003 100644 (file)
--- a/modules/ssl/ssl_scache.c
+++ b/modules/ssl/ssl_scache.c
@@ -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

diff --git a/modules/ssl/ssl_scache_dbm.c b/modules/ssl/ssl_scache_dbm.c
index 0c08318592d7810bcf5a42b24506c9f44f28b2c2..4dbfacbf87fb4cb2f127802680bd01a7aa47ad0b 100644 (file)
--- a/modules/ssl/ssl_scache_dbm.c
+++ b/modules/ssl/ssl_scache_dbm.c
@@ -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);

diff --git a/modules/ssl/ssl_scache_dc.c b/modules/ssl/ssl_scache_dc.c
index 281bf8a5114530d6956ad5f420ff34bcc385ccc6..d8aa1eb2a9cdc6c73de446f3550083e0e354389c 100644 (file)
--- a/modules/ssl/ssl_scache_dc.c
+++ b/modules/ssl/ssl_scache_dc.c
@@ -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);

diff --git a/modules/ssl/ssl_scache_shmcb.c b/modules/ssl/ssl_scache_shmcb.c
index fe8df27cf6d784fd6159a869cb7d42a192424955..ee02a407ec35d212136a01c53f6f1cddaff18453 100644 (file)
--- a/modules/ssl/ssl_scache_shmcb.c
+++ b/modules/ssl/ssl_scache_shmcb.c
@@ -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);