From e68dcc175c738b16fb03a840bcb48d0f36e62ffd Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 14 Feb 2009 19:21:51 +0000 Subject: merge revision(s) 20248: * lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete. a patch from Alan Johnson 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 --- lib/net/ftp.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/net') 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 -- cgit v1.2.3