* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
emboss 2011-09-23 03:22:09 +00:00
parent 010c8e5970
commit b3e0a54393
2 changed files with 9 additions and 0 deletions

View file

@ -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

View file

@ -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