* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@20249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-11-18 12:29:25 +00:00
Родитель fd346f769b
Коммит e606e7e32b
2 изменённых файлов: 8 добавлений и 2 удалений

Просмотреть файл

@ -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> 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 * lib/logger.rb (ProgName): fixed for svn, based on a patch from

Просмотреть файл

@ -170,9 +170,9 @@ module Net
end end
def open_socket(host, port) def open_socket(host, port)
if defined? SOCKSsocket and ENV["SOCKS_SERVER"] if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
@passive = true @passive = true
return SOCKSsocket.open(host, port) return SOCKSSocket.open(host, port)
else else
return TCPSocket.open(host, port) return TCPSocket.open(host, port)
end end