You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2016/03/08 21:11:15 UTC
svn commit: r1734140 - /tomcat/native/trunk/native/src/ssl.c
Author: rjung
Date: Tue Mar 8 20:11:15 2016
New Revision: 1734140
URL: http://svn.apache.org/viewvc?rev=1734140&view=rev
Log:
Another recent OpenSSL 1.1.0 API change.
Modified:
tomcat/native/trunk/native/src/ssl.c
Modified: tomcat/native/trunk/native/src/ssl.c
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1734140&r1=1734139&r2=1734140&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Tue Mar 8 20:11:15 2016
@@ -310,7 +310,11 @@ static apr_status_t ssl_init_cleanup(voi
ENGINE_cleanup();
#endif
CRYPTO_cleanup_all_ex_data();
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_remove_thread_state(NULL);
+#else
+ ERR_remove_thread_state();
+#endif
/* Don't call ERR_free_strings here; ERR_load_*_strings only
* actually load the error strings once per process due to static
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org