archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 18368:

Browse source 
* lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for
	  environments without OpenSSL.  backported from trunk.
	  fixed [ruby-dev:35755].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-01-09 10:25:53 +00:00
parent d458cea640
commit 375cd73c20
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Jan 9 19:25:25 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:24:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jan 8 13:24:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (deferred_nodes, compstmt, arg, fixup_nodes, range_op): fix * parse.y (deferred_nodes, compstmt, arg, fixup_nodes, range_op): fix

6
lib/net/imap.rb
View file

@ -284,9 +284,11 @@ module Net
# Disconnects from the server. # Disconnects from the server.
def disconnect def disconnect
if SSL::SSLSocket === @sock begin
# try to call SSL::SSLSocket#io.
@sock.io.shutdown @sock.io.shutdown
else rescue NoMethodError
# @sock is not an SSL::SSLSocket.
@sock.shutdown @sock.shutdown
end end
@receiver_thread.join @receiver_thread.join

8
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7" #define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2009-01-08" #define RUBY_RELEASE_DATE "2009-01-09"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090108 #define RUBY_RELEASE_CODE 20090109
#define RUBY_PATCHLEVEL 80 #define RUBY_PATCHLEVEL 81
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7 #define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 8 #define RUBY_RELEASE_DAY 9
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];