]> granicus.if.org Git - apache/commitdiff
Support for OpenSSL 1.1.0:
authorRainer Jung <rjung@apache.org>
Sun, 20 Mar 2016 13:10:05 +0000 (13:10 +0000)
committerRainer Jung <rjung@apache.org>
Sun, 20 Mar 2016 13:10:05 +0000 (13:10 +0000)
- 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

modules/ssl/ssl_util.c

index 05c4fbd58321a22e8efa8697a587203f3bcf16d4..7c6af0d4bda50d726c3a6298113b82374b906177 100644 (file)
@@ -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 */