From: Sander Temme Date: Thu, 5 Apr 2007 05:43:25 +0000 (+0000) Subject: Move the thread locking upcall initialization before the hardware library init, X-Git-Tag: 2.3.0~1847 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4db3a3a75ab8a576f806df85301097c89f347fd3;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/CHANGES b/CHANGES index 0fa71dc07e3..9d6f128fbae 100644 --- a/CHANGES +++ b/CHANGES @@ -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 diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index dedc2e0c743..05600c84e3a 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -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);