Commit 38a53977 authored by Sander Temme's avatar Sander Temme
Browse files

Move the thread locking upcall initialization before the hardware library init, 

so the hardware library can pick up the locking callbacks. Fixes PR 20951.
Tested on Linux with trunk and an nCipher nShield card, and on Solaris 10/Sparc
on 2.0.55 with an nCipher NetHSM.



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

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]













  *) mod_ssl: initialize thread locks before initializing the hardware













     acceleration library, so the latter can make use of the former. 













     PR 20951. [adunn at ncipher.com, reviewed by Sander Temme]



























  *) mod_so: Solve dev's confusion by reporting expected/seen module















     magic signatures when failing with a 'garbled' message, and solve















     user's confusion by pointing out 'perhaps compiled for a different

































modules/ssl/ssl_engine_init.c



+4
−4






























Original line number
Diff line number
Diff line








@@ -210,6 +210,10 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,





























    }





























#if APR_HAS_THREADS













    ssl_util_thread_setup(p);













#endif





























    /*















     * SSL external crypto device ("engine") support















     */









@@ -217,10 +221,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,













    ssl_init_Engine(base_server, p);















#endif





























#if APR_HAS_THREADS













    ssl_util_thread_setup(p);













#endif





























    ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,















                 "Init: Initialized %s library", SSL_LIBRARY_NAME);