archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 13:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 20248:

Browse source 
* 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/branches/ruby_1_8_7@22315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-14 19:21:51 +00:00
parent 3ab5be3476
commit e68dcc175c
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/net/ftp.rb
View file

@ -152,9 +152,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