merge revision(s) 57359: [Backport #13442]

	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/branches/ruby_2_4@58624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

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
         }