aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-11 03:13:49 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-11 03:13:49 +0000
commitc7dc6a34b50e4d9d76c1fe9d2888ccb2aa6aeef3 (patch)
tree73c0ca75b6c764f03435b8293ea11da332b17f67
parentd5f479ca7e4c5809b42050a467116484bc33c438 (diff)
downloadruby-c7dc6a34b50e4d9d76c1fe9d2888ccb2aa6aeef3.tar.gz
* test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised
in OpenSSL tests. [ruby-core:70020][Bug #11368] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/openssl/test_ssl.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ad990dfa6..3ae6d0d755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 11 12:13:20 2015 Jeremy Evans <merch-redmine@jeremyevans.net>
+
+ * test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised
+ in OpenSSL tests. [ruby-core:70020][Bug #11368]
+
Tue Aug 11 11:54:13 2015 Alexey Lipnyagov <liptonshmidt@gmail.com>
* string.c: Fix documentation for String#slice
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 1d3e1b51aa..857e6e813b 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -1164,7 +1164,7 @@ end
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