aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-23 03:14:24 +0000
committeremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-23 03:14:24 +0000
commite3af0655e21a1f6e1fcf3d50c6ac8a5486d8b57b (patch)
treeb4c66bb87649ffc0bbd3abbd80176072f1722229
parent64b7b548e0f5d143a6c18c1d295ed274fac48761 (diff)
downloadruby-e3af0655e21a1f6e1fcf3d50c6ac8a5486d8b57b.tar.gz
* test/openssl/test_ssl_session.rb: ensure server calls callbacks in
test_ctx_server_session_cb. Thanks to Eric Wong for the patch. [Bug #5336] [ruby-core:39619] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/openssl/test_ssl_session.rb1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 65ecd6fba8..15ab7b2e3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 23 11:59:08 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+
+ * test/openssl/test_ssl_session.rb: ensure server calls callbacks in
+ test_ctx_server_session_cb. Thanks to Eric Wong for the patch.
+ [Bug #5336] [ruby-core:39619]
+
Thu Sep 22 02:53:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_call_cfunc): suppress a warning. note that
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
index b975c48d11..28d40ddcf2 100644
--- a/test/openssl/test_ssl_session.rb
+++ b/test/openssl/test_ssl_session.rb
@@ -316,6 +316,7 @@ end
ssl.connect
last_client_session = ssl.session
ssl.close
+ Thread.pass # try to ensure server calls callbacks
assert(called.delete(:new))
assert(called.delete(:remove))
end