]> granicus.if.org Git - apache/commitdiff
Remove calling ERR_remove_thread_state when
authorRainer Jung <rjung@apache.org>
Wed, 10 Aug 2016 11:20:00 +0000 (11:20 +0000)
committerRainer Jung <rjung@apache.org>
Wed, 10 Aug 2016 11:20:00 +0000 (11:20 +0000)
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

modules/ssl/mod_ssl.c

index 4c3746f4780c0224c7aa86875593c6e1176c0bea..abef4b386d09ee08ab1def250dff0a342e247499 100644 (file)
@@ -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