From 4cb6a7fcd5740bfc58788bbd1b6f08fbc8f8b277 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 31 Jan 2004 18:11:55 +0000
Subject: [PATCH] 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
---
 ChangeLog       | 5 +++++
 lib/open-uri.rb | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d83d664581..c9e2f06a16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  1 03:07:25 2004  Tanaka Akira  <akr@m17n.org>
+
+        * lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
+         raise an errror on non-http proxy URI.
+
 Sat Jan 31 09:20:32 2004  NAKAMURA, Hiroshi  <nakahiro@sairon.co.jp>
 
 	* sample/openssl/gen_csr.rb: wrong usage string.
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|