diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:48:48 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:48:48 +0000 |
| commit | 4fd495ed05fcda5aa2659327c61d072edbbef3e0 (patch) | |
| tree | 30bcd7252c17b37d3310bb750b39a56a37f3ec25 | |
| parent | 813a182abdde913108540e3774f9d7cb9ea78286 (diff) | |
| download | ruby-4fd495ed05fcda5aa2659327c61d072edbbef3e0.tar.gz ruby-4fd495ed05fcda5aa2659327c61d072edbbef3e0.tar.xz ruby-4fd495ed05fcda5aa2659327c61d072edbbef3e0.zip | |
merges r20249 from trunk into ruby_1_9_1.
* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/net/ftp.rb | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Nov 18 20:30:08 2008 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]. + Tue Nov 18 16:18:23 2008 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 e0aa6f6ad..06cc3eafa 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -170,9 +170,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 |