mod_ssl: initialize thread locks before initializing the hardware

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

PR: 20951
Patch: http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch
Submitted by: <adunn ncipher.com>
Reviewed by: sctemme, rpluem, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@536375 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 7934ae72eff4867ebbf748842cbc74945b3ebe67..263853acdf82184568903dffd3fa4f305b10bf1e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.60
 
+  *) mod_ssl: initialize thread locks before initializing the hardware
+     acceleration library, so the latter can make use of the former. 
+     PR 20951. [<adunn ncipher.com>]
+
   *) mod_ssl: Support limited buffering of request bodies to allow 
      per-location renegotiation to proceed.  PR 12355.  [Joe Orton]
 

diff --git a/STATUS b/STATUS
index 98b257f9e698c3b401e7764e30256989c066909a..2e63d271db1f7f2fad31b729bc28a9bfe800a7d4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -114,12 +114,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_ssl: Move thread locking upcall initialization before
-      hardware library initialization, so hardware library can use
-      these upcalls when run in a threaded MPM. Fixes PR 20951. 
-      [adunn at ncipher.com]
-      http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch
-      +1: sctemme, rpluem, wrowe
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 4f40f4b340cd132b8ca9e7f6849fa46b13cff0ed..dff0c5e35fa5268dd0db80d89c8e521be3d6cc1b 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -232,6 +232,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
      */
@@ -241,10 +245,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
 
     ssl_init_SSLLibrary(base_server);
 
-#if APR_HAS_THREADS
-    ssl_util_thread_setup(p);
-#endif
-
     /*
      * Seed the Pseudo Random Number Generator (PRNG)
      * only need ptemp here; nothing inside allocated from the pool