summaryrefslogtreecommitdiff
path: root/test/net
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-01 20:46:31 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-01 20:46:31 +0000
commit8e9bbfd513899c285b6c6edaedc1216e39d6976d (patch)
tree03b316caa8abef06f18eb076897ffbc49aac0752 /test/net
parentb238b5be91433f824d92da976a94c84451a91023 (diff)
* lib/webrick/ssl.rb (WEBrick::Config::SSL): add new key
SSLTmpDhCallback to set SSLContext#tmp_dh_calback. * lib/webrick/ssl.rb (WEBrick::GenericServer#setup_ssl_context): follow above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/net')
-rw-r--r--test/net/http/utils.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb
index 9bea8f5..02e99d4 100644
--- a/test/net/http/utils.rb
+++ b/test/net/http/utils.rb
@@ -59,6 +59,7 @@ module TestNetHTTPUtils
:SSLEnable => true,
:SSLCertificate => config('ssl_certificate'),
:SSLPrivateKey => config('ssl_private_key'),
+ :SSLTmpDhCallback => proc { OpenSSL::TestUtils::TEST_KEY_DH1024 },
})
end
@server = WEBrick::HTTPServer.new(server_config)