summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-02 05:22:43 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-02 05:22:43 +0000
commitdc7e0e1219430d3b3f92721e03abafb6cd5423c8 (patch)
tree66bc4e6cc79a9d6101f74a7a30ae349723156c5f
parentac4da3f2d3603897a4ad1978b82fdb79a6ea1bec (diff)
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--test/openssl/test_ssl.rb5
-rw-r--r--version.h11
3 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ac7fda8028..6feac2c700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 2 14:17:09 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * 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@ruby-lang.org>
* lib/mkmf.rb (mkintpath): new function which converts native path
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 29d3d19edc..2caadd1c67 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -416,7 +416,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
diff --git a/version.h b/version.h
index b589bacb98..7b13700ecd 100644
--- a/version.h
+++ b/version.h
@@ -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 @@ RUBY_EXTERN const char *ruby_copyright;
+