From: Rainer Jung <rjung@apache.org>
Date: Wed, 10 Aug 2016 21:17:37 +0000 (+0000)
Subject: Remove calling ERR_remove_thread_state when
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a31c299f101f088cb0803473d123ba51b76360d;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.

Backport of r1755725 from trunk.


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

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