emboss	2011-09-23 13:56:55 +0900 (Fri, 23 Sep 2011)

  New Revision: 33316

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

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

  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 33315)
+++ ruby_1_9_3/ChangeLog	(revision 33316)
@@ -1,3 +1,12 @@
+Fri Sep 23 06:54:44 2011  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* 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@g...>
 
 	* backport r33311 from trunk.
Index: ruby_1_9_3/test/openssl/test_ssl_session.rb
===================================================================
--- ruby_1_9_3/test/openssl/test_ssl_session.rb	(revision 33315)
+++ ruby_1_9_3/test/openssl/test_ssl_session.rb	(revision 33316)
@@ -108,11 +108,9 @@
     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

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