diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-16 12:35:45 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-16 12:35:45 +0000 |
commit | 97ee61ab88553780aec7af7c239e4466c029d666 (patch) | |
tree | 857a524ed7598cca3005519f033edabdfc95c9b0 | |
parent | 457a6fda26873c0a3faa9f860a72e266715a969a (diff) |
merges r30551 from trunk into ruby_1_9_2.
--
* test/net/smtp/test_ssl_socket.rb: fix dependency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/net/smtp/test_ssl_socket.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/net/smtp/test_ssl_socket.rb b/test/net/smtp/test_ssl_socket.rb index f01758a183..dc8b03e07a 100644 --- a/test/net/smtp/test_ssl_socket.rb +++ b/test/net/smtp/test_ssl_socket.rb @@ -15,6 +15,7 @@ module Net end end + require 'stringio' class SSLSocket < StringIO attr_accessor :sync_close, :connected, :closed @@ -87,4 +88,4 @@ module Net ].join("\r\n") + "\r\n" end end -end +end if defined?(OpenSSL) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 158 +#define RUBY_PATCHLEVEL 159 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |