shyouhei	2009-02-15 04:21:51 +0900 (Sun, 15 Feb 2009)

  New Revision: 22315

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

  Log:
    merge revision(s) 20248:
    * 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_8_7/ChangeLog
    branches/ruby_1_8_7/lib/net/ftp.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22314)
+++ ruby_1_8_7/ChangeLog	(revision 22315)
@@ -1,3 +1,9 @@
+Sun Feb 15 04:21:42 2009  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].
+
 Fri Feb 13 19:18:42 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22314)
+++ ruby_1_8_7/version.h	(revision 22315)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-15"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090215
-#define RUBY_PATCHLEVEL 117
+#define RUBY_PATCHLEVEL 118
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/net/ftp.rb
===================================================================
--- ruby_1_8_7/lib/net/ftp.rb	(revision 22314)
+++ ruby_1_8_7/lib/net/ftp.rb	(revision 22315)
@@ -152,9 +152,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/