Support for OpenSSL 1.1.0:

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

Backport of r1735875 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1755845 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index ddde3c74ef5731cafa21c277fcac77c476488bdb..ee4c808eb7ffb7a04e6ee0e32e9192e1b0e44c42 100644 (file)
--- 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
  */
@@ -422,4 +423,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 */