summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--lib/open-uri.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eae7d1d8e5..2edbf43f90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ Sun Feb 8 21:39:06 2009 Akinori MUSHA <knu@iDaemons.org>
[ruby-core:4848] (r9166)
(:proxy_http_basic_authentication): new option. (r9336)
(OpenURI.open_loop): prohibit multiple proxy options. (r9339)
+ (OpenURI.open_loop): find_proxy should return nil when proxy
+ does not exist. [ruby-dev:27630] (r9500)
Mon Feb 9 01:21:16 2009 Tanaka Akira <akr@fsij.org>
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 57690e4aaf..18fdce82c8 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -170,7 +170,7 @@ module OpenURI
end
case opt_proxy
when true
- find_proxy = lambda {|u| [u.find_proxy, nil, nil]}
+ find_proxy = lambda {|u| pxy = u.find_proxy; pxy ? [pxy, nil, nil] : nil}
when nil, false
find_proxy = lambda {|u| nil}
when String