From: Rainer Jung <rjung@apache.org>
Date: Sun, 20 Mar 2016 13:10:05 +0000 (+0000)
Subject: Support for OpenSSL 1.1.0:
X-Git-Tag: 2.5.0-alpha~1864
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37b136b29ced6160b24218e73557518f69c9f125;p=apache

Support for OpenSSL 1.1.0:
- remove thread locking. It is now builtin
  for OpenSSL 1.1.0


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

diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index 05c4fbd583..7c6af0d4bd 100644
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -247,6 +247,7 @@ void ssl_asn1_table_unset(apr_hash_t *table,
 }
 
 #if APR_HAS_THREADS
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 /*
  * To ensure thread-safetyness in OpenSSL - work in progress
  */
@@ -454,4 +455,5 @@ void ssl_util_thread_setup(apr_pool_t *p)
     apr_pool_cleanup_register(p, NULL, ssl_util_thread_cleanup,
                                        apr_pool_cleanup_null);
 }
-#endif
+#endif /* #if OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif /* #if APR_HAS_THREADS */