summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/uri/generic.rb2
-rw-r--r--test/uri/test_generic.rb4
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@
Fri Feb 12 12:20:56 2016 Nobuyoshi Nakada <[email protected]>
* error.c (name_err_initialize, nometh_err_initialize): [DOC] fix
@@ -1546,7 +1546,7 @@ module 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)
return nil
@@ -835,6 +835,10 @@ class URI::TestGeneric < Test::Unit::TestCase
assert_nil(URI("http://example.org/").find_proxy)
assert_nil(URI("http://www.example.org/").find_proxy)
}
end
def test_find_proxy_bad_value