kazu	2009-03-12 15:28:07 +0900 (Thu, 12 Mar 2009)

  New Revision: 22910

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

  Log:
    * test/openssl/test_ssl.rb (OpenSSL#test_client_session):
      Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?),
      when use default SSLContext. [ruby-dev:36167]
      backported r19268 from trunk. [ruby-core:22843]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/test/openssl/test_ssl.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22909)
+++ ruby_1_8/ChangeLog	(revision 22910)
@@ -1,3 +1,10 @@
+Thu Mar 12 15:26:02 2009  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* test/openssl/test_ssl.rb (OpenSSL#test_client_session):
+	  Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?),
+	  when use default SSLContext. [ruby-dev:36167]
+	  backported r19268 from trunk. [ruby-core:22843]
+
 Thu Mar 12 13:02:12 2009  NAKAMURA Usaku  <usa@r...>
 
 	* mkconfig.rb: patchlevel is sometimes minus.
Index: ruby_1_8/test/openssl/test_ssl.rb
===================================================================
--- ruby_1_8/test/openssl/test_ssl.rb	(revision 22909)
+++ ruby_1_8/test/openssl/test_ssl.rb	(revision 22910)
@@ -431,7 +431,10 @@
     start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
       2.times do
         sock = TCPSocket.new("127.0.0.1", port)
-        ssl = OpenSSL::SSL::SSLSocket.new(sock)
+        # Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?),
+        # when use default SSLContext. [ruby-dev:36167]
+        ctx = OpenSSL::SSL::SSLContext.new("TLSv1")
+        ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
         ssl.sync_close = true
         ssl.session = last_session if last_session
         ssl.connect

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