diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-31 18:11:55 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-31 18:11:55 +0000 |
commit | 4cb6a7fcd5740bfc58788bbd1b6f08fbc8f8b277 (patch) | |
tree | 10d4c32e01af35dfe973545f6acb3db476682073 /lib/open-uri.rb | |
parent | 3f9070033c0a07da44fb1abda50d95329c20ce4a (diff) |
lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
raise an errror on non-http proxy URI.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/open-uri.rb')
-rw-r--r-- | lib/open-uri.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb index e448e47af5..22c27c8ccc 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -477,12 +477,21 @@ module URI # Use CGI_HTTP_PROXY. cf. libwww-perl. proxy_uri = ENV["CGI_#{name.upcase}"] end + elsif name == 'http_proxy' + unless proxy_uri = ENV[name] + if proxy_uri = ENV[name.upcase] + warn 'The environment variable HTTP_PROXY is discouraged. Use http_proxy.' + end + end else proxy_uri = ENV[name] || ENV[name.upcase] end if proxy_uri proxy_uri = URI.parse(proxy_uri) + unless URI::HTTP === proxy_uri + raise "Non-http proxy URI: #{proxy_uri}" + end name = 'no_proxy' if no_proxy = ENV[name] || ENV[name.upcase] no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port| |