diff --git a/ChangeLog b/ChangeLog
index df345f3c24..ca3c867c61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Mon Feb  2 00:01:19 2004  Tanaka Akira  <akr@m17n.org>
+Mon Feb  2 00:28:54 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::Generic#find_proxy): return nil on loopback
+	  address.
 
 	* lib/resolv-replace.rb (BasicSocket#send): don't replace because
 	  it has no hostname argument.
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index e601c5cf5c..c6bfd7a509 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -488,6 +488,15 @@ module URI
         proxy_uri = ENV[name] || ENV[name.upcase]
       end
 
+      if proxy_uri && self.host
+        require 'socket'
+        begin
+          addr = IPSocket.getaddress(self.host)
+          proxy_uri = nil if /\A127\.|\A::1\z/ =~ addr
+        rescue SocketError
+        end
+      end
+
       if proxy_uri
         proxy_uri = URI.parse(proxy_uri)
         unless URI::HTTP === proxy_uri