From: Rainer Jung <rjung@apache.org>
Date: Wed, 10 Aug 2016 21:16:27 +0000 (+0000)
Subject: Compatibility with OpenSSL 1.1.0 pre6.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=497035ebe08670c37cf1f2d6ee5eb21c1a461469;p=thirdparty%2Fapache%2Fhttpd.git

Compatibility with OpenSSL 1.1.0 pre6.

Backport of r1755657 from trunk.


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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index a1ff3be852e..ae1c57c0cd2 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -313,11 +313,7 @@ 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