kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/resolv-replace.rb: suppress warning.

Browse source 
* lib/open-uri.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-10-29 22:02:39 +00:00
parent fea0365dea
commit aeab9011fe
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Oct 30 07:01:53 2010 Tanaka Akira <akr@fsij.org>
* lib/resolv-replace.rb: suppress warning.
* lib/open-uri.rb: ditto.
Sat Oct 30 06:32:52 2010 Tanaka Akira <akr@fsij.org> Sat Oct 30 06:32:52 2010 Tanaka Akira <akr@fsij.org>
* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the * test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the

6
lib/open-uri.rb
View file

@ -126,7 +126,7 @@ module OpenURI
def OpenURI.open_uri(name, *rest) # :nodoc: def OpenURI.open_uri(name, *rest) # :nodoc:
uri = URI::Generic === name ? name : URI.parse(name) uri = URI::Generic === name ? name : URI.parse(name)
mode, perm, rest = OpenURI.scan_open_optional_arguments(*rest) mode, _, rest = OpenURI.scan_open_optional_arguments(*rest)
options = rest.shift if !rest.empty? && Hash === rest.first options = rest.shift if !rest.empty? && Hash === rest.first
raise ArgumentError.new("extra arguments") if !rest.empty? raise ArgumentError.new("extra arguments") if !rest.empty?
options ||= {} options ||= {}
@ -480,7 +480,7 @@ module OpenURI
# It is downcased for canonicalization. # It is downcased for canonicalization.
# Content-Type parameters are stripped. # Content-Type parameters are stripped.
def content_type def content_type
type, *parameters = content_type_parse type, *_ = content_type_parse
type || 'application/octet-stream' type || 'application/octet-stream'
end end
@ -712,7 +712,7 @@ module URI
when 0 # no proxy setting anyway. when 0 # no proxy setting anyway.
proxy_uri = nil proxy_uri = nil
when 1 when 1
k, v = pairs.shift k, _ = pairs.shift
if k == 'http_proxy' && ENV[k.upcase] == nil if k == 'http_proxy' && ENV[k.upcase] == nil
# http_proxy is safe to use because ENV is case sensitive. # http_proxy is safe to use because ENV is case sensitive.
proxy_uri = ENV[name] proxy_uri = ENV[name]

1
lib/resolv-replace.rb
View file

@ -51,7 +51,6 @@ class UDPSocket < IPSocket
rescue Resolv::ResolvError rescue Resolv::ResolvError
raise SocketError, "Hostname not known: #{host}" raise SocketError, "Hostname not known: #{host}"
end end
err = nil
addrs[0...-1].each {|addr| addrs[0...-1].each {|addr|
begin begin
return original_resolv_send(mesg, flags, addr, port) return original_resolv_send(mesg, flags, addr, port)