Commit 8708252f authored by Rainer Jung's avatar Rainer Jung
Browse files

Support for OpenSSL 1.1.0: 

- ERR_remove_thread_state() no longer has an
  argument.

Backport of r1735878 from trunk.


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

modules/ssl/mod_ssl.c

+8 −0
Original line number Diff line number Diff line
@@ -312,7 +312,15 @@ static apr_status_t ssl_cleanup_pre_config(void *data) 
#if HAVE_ENGINE_LOAD_BUILTIN_ENGINES

    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



    /* Don't call ERR_free_strings in earlier versions, ERR_load_*_strings only

     * actually loaded the error strings once per process due to static