diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-14 19:21:51 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-14 19:21:51 +0000 |
| commit | e68dcc175c738b16fb03a840bcb48d0f36e62ffd (patch) | |
| tree | 480cf5c9f700aa84460d035d73641c21c92e011a /lib/net | |
| parent | 3ab5be34767e6ad85392a212e93632c0c4f22a8e (diff) | |
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_7@22315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
| -rw-r--r-- | lib/net/ftp.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index d890130ce7..e07418e83e 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 |