nagachika	2015-08-12 01:08:14 +0900 (Wed, 12 Aug 2015)

  New Revision: 51536

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

  Log:
    merge revision(s) 51531: [Backport #11368]
    
    * test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised
      in OpenSSL tests. [ruby-core:70020][Bug #11368]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/openssl/test_ssl.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 51535)
+++ ruby_2_2/ChangeLog	(revision 51536)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Aug 12 01:05:58 2015  Jeremy Evans  <merch-redmine@j...>
+
+	* test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised
+	  in OpenSSL tests. [ruby-core:70020][Bug #11368]
+
 Wed Aug 12 00:54:29 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 51535)
+++ ruby_2_2/version.h	(revision 51536)
@@ -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-08-12"
-#define RUBY_PATCHLEVEL 157
+#define RUBY_PATCHLEVEL 158
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_2/test/openssl/test_ssl.rb
===================================================================
--- ruby_2_2/test/openssl/test_ssl.rb	(revision 51535)
+++ ruby_2_2/test/openssl/test_ssl.rb	(revision 51536)
@@ -906,7 +906,7 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/openssl/test_ssl.rb#L906
     ssl = ctx ? OpenSSL::SSL::SSLSocket.new(sock, ctx) : OpenSSL::SSL::SSLSocket.new(sock)
     ssl.sync_close = true
     ssl.connect
-    yield ssl
+    yield ssl if block_given?
   ensure
     if ssl
       ssl.close

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


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