diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/uri/generic.rb | 32 | ||||
| -rw-r--r-- | test/uri/test_generic.rb | 4 |
3 files changed, 23 insertions, 19 deletions
@@ -1,3 +1,9 @@ +Thu Sep 12 14:58:58 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/uri/generic.rb (URI::Generic.find_proxy): return nil if + http_proxy environment variable is empty string. + [ruby-core:57140] [Bug #8898] + Fri Sep 13 10:40:28 2013 Eric Hodel <drbrain@segment7.net> * lib/rubygems: Update to RubyGems 2.1.3 diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index 387682b5b5..b1195fdf0b 100644 --- a/lib/uri/generic.rb +++ b/lib/uri/generic.rb @@ -1647,31 +1647,29 @@ module URI proxy_uri = ENV[name] || ENV[name.upcase] end - if proxy_uri && self.hostname + if proxy_uri.nil? || proxy_uri.empty? + return nil + end + + if self.hostname require 'socket' begin addr = IPSocket.getaddress(self.hostname) - proxy_uri = nil if /\A127\.|\A::1\z/ =~ addr + return nil if /\A127\.|\A::1\z/ =~ addr rescue SocketError end end - if proxy_uri - proxy_uri = URI.parse(proxy_uri) - name = 'no_proxy' - if no_proxy = ENV[name] || ENV[name.upcase] - no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port| - if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host && - (!port || self.port == port.to_i) - proxy_uri = nil - break - end - } - end - proxy_uri - else - nil + name = 'no_proxy' + if no_proxy = ENV[name] || ENV[name.upcase] + no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port| + if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host && + (!port || self.port == port.to_i) + return nil + end + } end + URI.parse(proxy_uri) end end end diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb index d22d3c1dd6..e8becd5b8e 100644 --- a/test/uri/test_generic.rb +++ b/test/uri/test_generic.rb @@ -760,12 +760,12 @@ class URI::TestGeneric < Test::Unit::TestCase assert_nil(URI("http://192.0.2.2/").find_proxy) } with_env('http_proxy'=>'') { - assert_equal(URI(''), URI("http://192.0.2.1/").find_proxy) + assert_nil(URI("http://192.0.2.1/").find_proxy) assert_nil(URI("ftp://192.0.2.1/").find_proxy) } with_env('ftp_proxy'=>'') { assert_nil(URI("http://192.0.2.1/").find_proxy) - assert_equal(URI(''), URI("ftp://192.0.2.1/").find_proxy) + assert_nil(URI("ftp://192.0.2.1/").find_proxy) } end |