From 4fd495ed05fcda5aa2659327c61d072edbbef3e0 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 18 Nov 2008 16:48:48 +0000 Subject: 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 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 --- lib/net/ftp.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') 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 -- cgit