diff options
| author | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-23 04:56:55 +0000 |
|---|---|---|
| committer | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-23 04:56:55 +0000 |
| commit | 387b4169fbc111d27ca50fd43748a74ebf8ae867 (patch) | |
| tree | 538fbd9ef10a844f9c11c18d6a44103936dcb57f | |
| parent | 58d30b9617e7491576b55384c0b0d93f08dadceb (diff) | |
* backport r33315 from trunk.
* test/openssl/test_ssl_session.rb: execute test_session_exts_read
only for OpenSSL versions >= 0.9.8k. Thanks, Eric Wong, for
reporting this.
[Bug #4961] [ruby-core:37726]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | test/openssl/test_ssl_session.rb | 4 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Fri Sep 23 06:54:44 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> + + * backport r33315 from trunk. + + * test/openssl/test_ssl_session.rb: execute test_session_exts_read + only for OpenSSL versions >= 0.9.8k. Thanks, Eric Wong, for + reporting this. + [Bug #4961] [ruby-core:37726] + Fri Sep 23 12:18:52 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> * backport r33311 from trunk. diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index 172d0d4c9f..12c6152f9b 100644 --- a/test/openssl/test_ssl_session.rb +++ b/test/openssl/test_ssl_session.rb @@ -108,11 +108,9 @@ __EOS__ assert_equal(2**31 - 1, sess.timeout.to_i) end -if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x00908000 def test_session_exts_read assert(OpenSSL::SSL::Session.new(DUMMY_SESSION)) - end -end + end if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x009080bf def test_client_session last_session = nil |