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

Support for OpenSSL 1.1.0:
- ERR_remove_thread_state() no longer has an
  argument.


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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index a19e24f18f..1892786f93 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -318,7 +318,11 @@ static apr_status_t ssl_cleanup_pre_config(void *data)
     ENGINE_cleanup();
 #endif
 #if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     ERR_remove_thread_state(NULL);
+#else
+    ERR_remove_thread_state();
+#endif
 #else
     ERR_remove_state(0);
 #endif