nagachika	2015-07-04 04:27:51 +0900 (Sat, 04 Jul 2015)

  New Revision: 51131

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51131

  Log:
    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+.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/rubygems/test_gem_remote_fetcher.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 51130)
+++ ruby_2_2/version.h	(revision 51131)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-07-04"
-#define RUBY_PATCHLEVEL 141
+#define RUBY_PATCHLEVEL 142
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 7
Index: ruby_2_2/test/rubygems/test_gem_remote_fetcher.rb
===================================================================
--- ruby_2_2/test/rubygems/test_gem_remote_fetcher.rb	(revision 51130)
+++ ruby_2_2/test/rubygems/test_gem_remote_fetcher.rb	(revision 51131)
@@ -854,7 +854,7 @@ gems: https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rubygems/test_gem_remote_fetcher.rb#L854
       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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50972


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/