httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1735878 - /httpd/httpd/trunk/modules/ssl/mod_ssl.c
Date Sun, 20 Mar 2016 13:23:35 GMT
Author: rjung
Date: Sun Mar 20 13:23:35 2016
New Revision: 1735878

URL: http://svn.apache.org/viewvc?rev=1735878&view=rev
Log:
Support for OpenSSL 1.1.0:
- ERR_remove_thread_state() no longer has an
  argument.

Modified:
    httpd/httpd/trunk/modules/ssl/mod_ssl.c

Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl.c?rev=1735878&r1=1735877&r2=1735878&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl.c Sun Mar 20 13:23:35 2016
@@ -318,8 +318,12 @@ static apr_status_t ssl_cleanup_pre_conf
     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
 



Mime
View raw message