Commit a3fa4a21 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

implement CRYPTO_set_id_callback 

PR:
Obtained from:
Submitted by:	Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90620 13f79535-47bb-0310-9956-ffa450edef68
parent 5d550741

modules/ssl/ssl_util.c

+8 −3
Original line number Diff line number Diff line
@@ -336,8 +336,7 @@ ssl_util_getmodconfig_ssl( 
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 void ssl_util_thread_locking_callback(int mode, int type, 
    }

}



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 @@ void ssl_util_thread_setup(server_rec *s, apr_pool_t *p) 
                        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,