diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | test/openssl/test_ssl_session.rb | 1 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Fri Sep 23 12:18:52 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> + + * backport r33311 from trunk. + + * 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 19:45:22 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * thread_pthread.c (ubf_select): activate timer thread when interrupt diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index 60079c6da1..172d0d4c9f 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 |