diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-14 19:21:18 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-14 19:21:18 +0000 |
commit | 7cdc932f5a0f4b2d984d6779fc6a255cb3789c49 (patch) | |
tree | 4262097985960344eb14c1b037cc90c1af949aaa | |
parent | 173502e368eb4de5c89b9a3e8ef915e2111d2e3d (diff) | |
download | ruby-7cdc932f5a0f4b2d984d6779fc6a255cb3789c49.tar.gz |
merge revision(s) 20248:
* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in
[ruby-core:19982].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/net/ftp.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sun Feb 15 04:18:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete. + a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in + [ruby-core:19982]. + Fri Feb 13 19:17:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/logger.rb (ProgName): fixed for svn, based on a patch from diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 40c79c885d..40e553e80e 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -152,9 +152,9 @@ module Net end def open_socket(host, port) - if defined? SOCKSsocket and ENV["SOCKS_SERVER"] + if defined? SOCKSSocket and ENV["SOCKS_SERVER"] @passive = true - return SOCKSsocket.open(host, port) + return SOCKSSocket.open(host, port) else return TCPSocket.open(host, port) end @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090215 -#define RUBY_PATCHLEVEL 331 +#define RUBY_PATCHLEVEL 332 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |