Merge branch 'maint-2.0' into maint

* maint-2.0:
  Ruby/OpenSSL 2.0.8
  test/test_ssl_session: set client protocol version explicitly
  test/test_pkey_rsa: fix test failure with OpenSSL 1.1.1
  extconf.rb: fix build with LibreSSL 2.7.0
  cipher: validate iterations argument for Cipher#pkcs5_keyivgen
  test/utils: disable Thread's report_on_exception in start_server

1 files changed, 12 insertions, 0 deletions

diff --git a/test/utils.rb b/test/utils.rb
index a3599490..6318246d 100644
--- a/test/utils.rb
+++ b/test/utils.rb
@@ -214,6 +214,10 @@ class OpenSSL::SSLTestCase < OpenSSL::TestCase
       threads = []
       begin
         server_thread = Thread.new do
+          if Thread.method_defined?(:report_on_exception=) # Ruby >= 2.4
+            Thread.current.report_on_exception = false
+          end
+
           begin
             loop do
               begin
@@ -227,6 +231,10 @@ class OpenSSL::SSLTestCase < OpenSSL::TestCase
               end
 
               th = Thread.new do
+                if Thread.method_defined?(:report_on_exception=)
+                  Thread.current.report_on_exception = false
+                end
+
                 begin
                   server_proc.call(ctx, ssl)
                 ensure
@@ -242,6 +250,10 @@ class OpenSSL::SSLTestCase < OpenSSL::TestCase
         end
 
         client_thread = Thread.new do
+          if Thread.method_defined?(:report_on_exception=)
+            Thread.current.report_on_exception = false
+          end
+
           begin
             block.call(port)
           ensure