httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_private.h ssl_scache.c ssl_scache_dbm.c ssl_scache_dc.c ssl_scache_shmcb.c
Date Thu, 27 May 2004 09:20:00 GMT
jorton      2004/05/27 02:20:00

  Modified:    modules/ssl ssl_private.h ssl_scache.c ssl_scache_dbm.c
                        ssl_scache_dc.c ssl_scache_shmcb.c
  Log:
  * 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.
  
  Revision  Changes    Path
  1.4       +0 -4      httpd-2.0/modules/ssl/ssl_private.h
  
  Index: ssl_private.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_private.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -d -u -r1.3 -r1.4
  --- ssl_private.h	25 May 2004 12:16:53 -0000	1.3
  +++ ssl_private.h	27 May 2004 09:20:00 -0000	1.4
  @@ -546,7 +546,6 @@
   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 @@
   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 @@
   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 @@
   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 */
  
  
  
  1.24      +0 -11     httpd-2.0/modules/ssl/ssl_scache.c
  
  Index: ssl_scache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -d -u -r1.23 -r1.24
  --- ssl_scache.c	28 Feb 2004 18:06:35 -0000	1.23
  +++ ssl_scache.c	27 May 2004 09:20:00 -0000	1.24
  @@ -134,17 +134,6 @@
       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
  
  
  
  1.28      +3 -1      httpd-2.0/modules/ssl/ssl_scache_dbm.c
  
  Index: ssl_scache_dbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_dbm.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -d -u -r1.27 -r1.28
  --- ssl_scache_dbm.c	28 Feb 2004 18:06:35 -0000	1.27
  +++ ssl_scache_dbm.c	27 May 2004 09:20:00 -0000	1.28
  @@ -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 @@
       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);
  
  
  
  1.6       +0 -6      httpd-2.0/modules/ssl/ssl_scache_dc.c
  
  Index: ssl_scache_dc.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_dc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -d -u -r1.5 -r1.6
  --- ssl_scache_dc.c	28 Feb 2004 18:06:35 -0000	1.5
  +++ ssl_scache_dc.c	27 May 2004 09:20:00 -0000	1.6
  @@ -162,12 +162,6 @@
       }
   }
   
  -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);
  
  
  
  1.27      +0 -6      httpd-2.0/modules/ssl/ssl_scache_shmcb.c
  
  Index: ssl_scache_shmcb.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_shmcb.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -d -u -r1.26 -r1.27
  --- ssl_scache_shmcb.c	12 May 2004 21:36:52 -0000	1.26
  +++ ssl_scache_shmcb.c	27 May 2004 09:20:00 -0000	1.27
  @@ -443,12 +443,6 @@
       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);
  
  
  

Mime
View raw message