shyouhei	2009-04-02 14:22:43 +0900 (Thu, 02 Apr 2009)

  New Revision: 23117

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

  Log:
    merge revision(s) 22910:
    * 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_7/ChangeLog
    branches/ruby_1_8_7/test/openssl/test_ssl.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 23116)
+++ ruby_1_8_7/ChangeLog	(revision 23117)
@@ -1,3 +1,10 @@
+Thu Apr  2 14:17:09 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 31 18:18:18 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (mkintpath): new function which converts native path
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 23116)
+++ ruby_1_8_7/version.h	(revision 23117)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-03-31"
+#define RUBY_RELEASE_DATE "2009-04-02"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090331
-#define RUBY_PATCHLEVEL 156
+#define RUBY_RELEASE_CODE 20090402
+#define RUBY_PATCHLEVEL 157
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 2
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
@@ -33,3 +33,4 @@
 
 
 
+
Index: ruby_1_8_7/test/openssl/test_ssl.rb
===================================================================
--- ruby_1_8_7/test/openssl/test_ssl.rb	(revision 23116)
+++ ruby_1_8_7/test/openssl/test_ssl.rb	(revision 23117)
@@ -416,7 +416,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/