From: Rainer Jung <rjung@apache.org>
Date: Wed, 10 Aug 2016 11:20:00 +0000 (+0000)
Subject: Remove calling ERR_remove_thread_state when
X-Git-Tag: 2.5.0-alpha~1304
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7871d235f1b9bb9bc210ebe43bf9db3dfb4aa4db;p=thirdparty%2Fapache%2Fhttpd.git

Remove calling ERR_remove_thread_state when
using OpenSSL 1.1.0.

This API is now a no-op in OpenSSL 1.1.0 and
deprecated.


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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 4c3746f4780..abef4b386d0 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -323,10 +323,12 @@ static apr_status_t ssl_cleanup_pre_config(void *data)
 #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
     ENGINE_cleanup();
 #endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 #if OPENSSL_VERSION_NUMBER >= 0x1000000fL
     ERR_remove_thread_state(NULL);
 #else
     ERR_remove_state(0);
+#endif
 #endif
 
     /* Don't call ERR_free_strings in earlier versions, ERR_load_*_strings only