Skip to content

Commit e25bb03

Browse files
committed
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_1@51176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 6282b15 commit e25bb03

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

test/rubygems/test_gem_remote_fetcher.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ def start_ssl_server(config = {})
744744
server.mount_proc("/insecure_redirect") { |req, res|
745745
res.set_redirect(WEBrick::HTTPStatus::MovedPermanently, req.query['to'])
746746
}
747-
server.ssl_context.tmp_dh_callback = proc { OpenSSL::PKey::DH.new 128 }
747+
server.ssl_context.tmp_dh_callback = proc {|_, _, k| OpenSSL::PKey::DH.new(k) }
748748
t = Thread.new do
749749
begin
750750
server.start

version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define RUBY_VERSION "2.1.7"
2-
#define RUBY_RELEASE_DATE "2015-07-03"
3-
#define RUBY_PATCHLEVEL 376
2+
#define RUBY_RELEASE_DATE "2015-07-07"
3+
#define RUBY_PATCHLEVEL 377
44

55
#define RUBY_RELEASE_YEAR 2015
66
#define RUBY_RELEASE_MONTH 7
7-
#define RUBY_RELEASE_DAY 3
7+
#define RUBY_RELEASE_DAY 7
88

99
#include "ruby/version.h"
1010

0 commit comments

Comments
 (0)