diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-09 03:15:35 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-09 03:15:35 +0000 |
| commit | 634b10efcd0cf6670ec0f6bfb5f55aeccc344290 (patch) | |
| tree | 2b3170d88e0681d618a2311a74565c9aeee6a840 | |
| parent | 6570774cac19ec01c69abe2906b4721b1878df8c (diff) | |
r22140@crimson: knu | 2009-02-08 21:54:23 +0900
(OpenURI.open_loop): find_proxy should return nil when proxy does not
exist. [ruby-dev:27630] (r9500)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | lib/open-uri.rb | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 |