summaryrefslogtreecommitdiff
path: root/lib/uri
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-17 12:54:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-17 12:54:35 +0000
commit556e3da4216c926e71dea9ce4ea4a08dcfdc1275 (patch)
tree987d473b21eb1e006708d439a86b441974d7ef2f /lib/uri
parent2a9dd6b81888433dbcbc466aefcad7e197880439 (diff)
uri/generic.rb: fix exception on non-IP format
* lib/uri/generic.rb (URI::Generic#find_proxy): match IP address no_proxy against resolved self IP address. [Fix GH-1513] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/uri')
-rw-r--r--lib/uri/generic.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index dcad27bc35..80d9616c1e 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1531,14 +1531,14 @@ module URI
if (!port || self.port == port.to_i)
if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host
return nil
- else
+ elsif addr
require 'ipaddr'
return nil if
begin
IPAddr.new(host)
rescue IPAddr::InvalidAddressError
next
- end.include?(self.host)
+ end.include?(addr)
end
end
}