diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/net/imap.rb | 6 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Fri Jan 9 19:22:24 2009 Shugo Maeda <shugo@ruby-lang.org> + + * lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for + environments without OpenSSL. backported from trunk. + fixed [ruby-dev:35755]. + Thu Jan 8 13:20:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (deferred_nodes, compstmt, arg, fixup_nodes, range_op): fix diff --git a/lib/net/imap.rb b/lib/net/imap.rb index f8c0d3be4c..6162ffa0d0 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -284,9 +284,11 @@ module Net # Disconnects from the server. def disconnect - if SSL::SSLSocket === @sock + begin + # try to call SSL::SSLSocket#io. @sock.io.shutdown - else + rescue NoMethodError + # @sock is not an SSL::SSLSocket. @sock.shutdown end @receiver_thread.join @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-08" +#define RUBY_RELEASE_DATE "2009-01-09" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090108 -#define RUBY_PATCHLEVEL 293 +#define RUBY_RELEASE_CODE 20090109 +#define RUBY_PATCHLEVEL 294 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |