From b3e0a54393eb5645c09f64ae2f60e3695beb245d Mon Sep 17 00:00:00 2001
From: emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 23 Sep 2011 03:22:09 +0000
Subject: [PATCH] * 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
---
 ChangeLog                        | 8 ++++++++
 test/openssl/test_ssl_session.rb | 1 +
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ac9c44bf6a..d226a752ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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