You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by rj...@apache.org on 2016/03/20 14:10:05 UTC

svn commit: r1735875 - /httpd/httpd/trunk/modules/ssl/ssl_util.c

Author: rjung
Date: Sun Mar 20 13:10:05 2016
New Revision: 1735875

URL: http://svn.apache.org/viewvc?rev=1735875&view=rev
Log:
Support for OpenSSL 1.1.0:
- remove thread locking. It is now builtin
  for OpenSSL 1.1.0

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_util.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util.c?rev=1735875&r1=1735874&r2=1735875&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util.c Sun Mar 20 13:10:05 2016
@@ -247,6 +247,7 @@ void ssl_asn1_table_unset(apr_hash_t *ta
 }
 
 #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 */