Commit 5a618852 authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent 1c437374

modules/ssl/mod_ssl.c

+2 −0
Original line number Diff line number Diff line
@@ -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