emboss	2011-09-23 12:22:09 +0900 (Fri, 23 Sep 2011)

  New Revision: 33313

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33313

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

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/openssl/test_ssl_session.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33312)
+++ ruby_1_9_3/ChangeLog	(revision 33313)
@@ -1,3 +1,11 @@
+Fri Sep 23 12:18:52 2011  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* 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@g...>
 
 	* thread_pthread.c (ubf_select): activate timer thread when interrupt
Index: ruby_1_9_3/test/openssl/test_ssl_session.rb
===================================================================
--- ruby_1_9_3/test/openssl/test_ssl_session.rb	(revision 33312)
+++ ruby_1_9_3/test/openssl/test_ssl_session.rb	(revision 33313)
@@ -316,6 +316,7 @@
         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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/