summaryrefslogtreecommitdiffstats
path: root/lib/net
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-18 12:29:25 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-18 12:29:25 +0000
commitd53982cdb96816c25c47b4368a20d7176392d800 (patch)
treef76b4483697dcff0ea2d52301f3f271caaaceab0 /lib/net
parent2ec2a112ab5a069faaaa5afff2298808325650f9 (diff)
downloadruby-d53982cdb96816c25c47b4368a20d7176392d800.tar.gz
ruby-d53982cdb96816c25c47b4368a20d7176392d800.tar.xz
ruby-d53982cdb96816c25c47b4368a20d7176392d800.zip
* 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/trunk@20249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r--lib/net/ftp.rb4
1 files changed, 2 insertions, 2 deletions
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