httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_util.c
Date Fri, 24 Aug 2001 06:15:39 GMT
dougm       01/08/23 23:15:39

  Modified:    modules/ssl ssl_util.c
  Log:
  implement CRYPTO_set_id_callback
  Submitted by:	Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
  Reviewed by:	dougm
  
  Revision  Changes    Path
  1.15      +8 -3      httpd-2.0/modules/ssl/ssl_util.c
  
  Index: ssl_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ssl_util.c	2001/08/24 05:31:51	1.14
  +++ ssl_util.c	2001/08/24 06:15:39	1.15
  @@ -336,8 +336,7 @@
   static apr_lock_t *lock_cs[CRYPTO_NUM_LOCKS];
   static long        lock_count[CRYPTO_NUM_LOCKS];
   
  -static void ssl_util_thread_locking_callback(int mode, int type,
  -                                             const char *file, int line)
  +static void ssl_util_thr_lock(int mode, int type, const char *file, int line)
   {
       if (mode & CRYPTO_LOCK) {
           apr_lock_acquire(lock_cs[type]);
  @@ -348,6 +347,11 @@
       }
   }
   
  +static unsigned long ssl_util_thr_id()
  +{
  +    return (unsigned long) apr_os_thread_current();
  +}
  +
   static apr_status_t ssl_util_thread_cleanup(void *data)
   {
       int i;
  @@ -385,7 +389,8 @@
                           mc->szMutexFile, p);
       }
   
  -    CRYPTO_set_locking_callback(ssl_util_thread_locking_callback);
  +    CRYPTO_set_id_callback(ssl_util_thr_id);
  +    CRYPTO_set_locking_callback(ssl_util_thr_lock);
   
       apr_pool_cleanup_register(p, NULL,
                                 ssl_util_thread_cleanup,
  
  
  

Mime
View raw message