]> granicus.if.org Git - apache/commitdiff
Support for OpenSSL 1.1.0:
authorRainer Jung <rjung@apache.org>
Sun, 20 Mar 2016 13:23:35 +0000 (13:23 +0000)
committerRainer Jung <rjung@apache.org>
Sun, 20 Mar 2016 13:23:35 +0000 (13:23 +0000)
- ERR_remove_thread_state() no longer has an
  argument.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735878 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/mod_ssl.c

index a19e24f18f2114be12824b67df81dbb8536e92ca..1892786f93fe2a82366977809c9cde9be5786b5d 100644 (file)
@@ -318,7 +318,11 @@ static apr_status_t ssl_cleanup_pre_config(void *data)
     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