From d53982cdb96816c25c47b4368a20d7176392d800 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 18 Nov 2008 12:29:25 +0000
Subject: * 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
---
 ChangeLog      | 6 ++++++
 lib/net/ftp.rb | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3927c9fb..e7a5ccfd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
-- 
cgit