ruby-changes:6851
From: shugo <ko1@a...>
Date: Tue, 5 Aug 2008 16:25:27 +0900 (JST)
Subject: [ruby-changes:6851] Ruby:r18367 (trunk): * lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for
shugo 2008-08-05 16:24:48 +0900 (Tue, 05 Aug 2008) New Revision: 18367 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18367 Log: * lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for environments without OpenSSL. fixed [ruby-dev:35755]. Modified files: trunk/ChangeLog trunk/lib/net/imap.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 18366) +++ ChangeLog (revision 18367) @@ -1,3 +1,8 @@ +Tue Aug 5 16:13:05 2008 Shugo Maeda <shugo@r...> + + * lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for + environments without OpenSSL. fixed [ruby-dev:35755]. + Tue Aug 5 14:19:22 2008 Nobuyoshi Nakada <nobu@r...> * file.c (rb_stat_mode): generalized st_mode mask. Index: lib/net/imap.rb =================================================================== --- lib/net/imap.rb (revision 18366) +++ lib/net/imap.rb (revision 18367) @@ -287,9 +287,11 @@ # 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/