nagachika	2015-11-01 03:42:37 +0900 (Sun, 01 Nov 2015)

  New Revision: 52413

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

  Log:
    merge revision(s) 49099: [Backport #10046]
    
    * test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
      fix test failure with OpenSSL disabled SSLv3 protocol.
      [ruby-core:63772] [Bug #10046]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/openssl/test_ssl_session.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52412)
+++ ruby_2_2/ChangeLog	(revision 52413)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun Nov  1 03:40:43 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
+	  fix test failure with OpenSSL disabled SSLv3 protocol.
+	  [ruby-core:63772] [Bug #10046]
+
 Tue Oct 27 23:58:32 2015  Koichi Sasada  <ko1@a...>
 
 	* vm.c (hook_before_rewind): prevent kicking :return event while
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52412)
+++ ruby_2_2/version.h	(revision 52413)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-10-28"
-#define RUBY_PATCHLEVEL 183
+#define RUBY_RELEASE_DATE "2015-11-01"
+#define RUBY_PATCHLEVEL 184
 
 #define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 11
+#define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"
 
Index: ruby_2_2/test/openssl/test_ssl_session.rb
===================================================================
--- ruby_2_2/test/openssl/test_ssl_session.rb	(revision 52412)
+++ ruby_2_2/test/openssl/test_ssl_session.rb	(revision 52413)
@@ -278,7 +278,7 @@ __EOS__ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/openssl/test_ssl_session.rb#L278
 
   def test_ctx_client_session_cb
     called = {}
-    ctx = OpenSSL::SSL::SSLContext.new("SSLv3")
+    ctx = OpenSSL::SSL::SSLContext.new
     ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
 
     ctx.session_new_cb = lambda { |ary|

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


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