From 85f3a89d60acbedc4792a2d69cc13ec22cf11434 Mon Sep 17 00:00:00 2001 From: kazu Date: Thu, 12 Mar 2009 06:28:07 +0000 Subject: * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/openssl/test_ssl.rb | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d85e46d877..e2c4fa3ccb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 12 15:26:02 2009 Kazuhiro NISHIYAMA + + * 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 * mkconfig.rb: patchlevel is sometimes minus. diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 43e7a31f82..684a17a5a4 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -431,7 +431,10 @@ class OpenSSL::TestSSL < Test::Unit::TestCase 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 -- cgit v1.2.3