summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-03 19:27:51 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-03 19:27:51 +0000
commit5f9386253bb9e7c967fe4077de4f482f9daa3c8b (patch)
tree9cffc64cebe9c4a94719c3da01689f99fd83a212 /test
parentaa4dc2b0dff042bd1d42994d3f55cdcf884a252f (diff)
merge revision(s) 50972:
test_gem_remote_fetcher.rb: get rid of errors * test/rubygems/test_gem_remote_fetcher.rb (start_ssl_server): temporary measure for "dh key too small" error of OpenSSL 1.0.2c+. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/rubygems/test_gem_remote_fetcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 883e1bd8e4..74c52b69d6 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -854,7 +854,7 @@ gems:
server.mount_proc("/insecure_redirect") { |req, res|
res.set_redirect(WEBrick::HTTPStatus::MovedPermanently, req.query['to'])
}
- server.ssl_context.tmp_dh_callback = proc { OpenSSL::PKey::DH.new 128 }
+ server.ssl_context.tmp_dh_callback = proc {|_, _, k| OpenSSL::PKey::DH.new(k) }
t = Thread.new do
begin
server.start