Approved backport:

    * 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.

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

diff --git a/CHANGES b/CHANGES
index d5e45c9488b4e82f97b623b8f5667062392130da..b8e87cd3dfff039a8f3cbbd77f62a4b6d5e916b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.5
 
+  *) mod_ssl: Move thread locking upcall initialization before
+     hardware library initialization, so hardware library can use
+     these upcalls when run in a threaded MPM. PR 20951.
+     [Sander Temme]
+
   *) ab.c: Correct behavior of HTTP request headers sent by ab
      in presence of -H command-line overrides. PR 31268, 26554.
      [Arvind Srinivasan <arvind.srinivasan  sun.com>]

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 7eb8ffac1a533aacfd743d7c1dfe0b064388ca9f..c6a5d1763c5fc497bfb8b3d7b367fa55dbbe41fd 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -231,6 +231,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
      */
@@ -238,10 +242,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);