diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-25 09:56:49 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-25 09:56:49 +0000 |
commit | 1cb4eae934bd5f2ff7eb9006702b76d6fb60c82d (patch) | |
tree | 724bde0bb8d3eac4c60ab8f6b289711d686e8fd4 /lib/open-uri.rb | |
parent | 21f5433ca124a3d28ec902e685f93c41eaa7c6ea (diff) | |
download | ruby-1cb4eae934bd5f2ff7eb9006702b76d6fb60c82d.tar.gz ruby-1cb4eae934bd5f2ff7eb9006702b76d6fb60c82d.tar.xz ruby-1cb4eae934bd5f2ff7eb9006702b76d6fb60c82d.zip |
* lib/open-uri.rb (URI::Generic#find_proxy): ENV case sensitivity test
refined.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/open-uri.rb')
-rw-r--r-- | lib/open-uri.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 168bc0a76..917f385ce 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -458,9 +458,19 @@ module URI # HTTP_PROXY conflicts with *_proxy for proxy settings and # HTTP_* for header informatin in CGI. # So it should be careful to use it. - case_sentsitive = /djgpp|bccwin32|mingw|mswin32|mswince|emx/ !~ RUBY_PLATFORM - if case_sentsitive - # http_proxy is safe to use. + pairs = ENV.reject {|k, v| /\Ahttp_proxy\z/i !~ k } + case pairs.length + when 0 # no proxy setting anyway. + proxy_uri = nil + when 1 + k, v = pairs[0] + if k == 'http_proxy' && ENV[k.upcase] == nil + # http_proxy is safe to use becase ENV is case sensitive. + proxy_uri = ENV[name] + else + proxy_uri = nil + end + else # http_proxy is safe to use becase ENV is case sensitive. proxy_uri = ENV[name] end if !proxy_uri |