yugui	2008-11-19 01:48:48 +0900 (Wed, 19 Nov 2008)

  New Revision: 20273

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20273

  Log:
    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 <alan.wayne.johnson at gmail.com> in
      [ruby-core:19982].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/net/ftp.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20272)
+++ ruby_1_9_1/ChangeLog	(revision 20273)
@@ -1,3 +1,9 @@
+Tue Nov 18 20:30:08 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
Index: ruby_1_9_1/lib/net/ftp.rb
===================================================================
--- ruby_1_9_1/lib/net/ftp.rb	(revision 20272)
+++ ruby_1_9_1/lib/net/ftp.rb	(revision 20273)
@@ -170,9 +170,9 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/