knu	2009-02-09 12:15:35 +0900 (Mon, 09 Feb 2009)

  New Revision: 22151

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22151

  Log:
     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)

  Modified directories:
    branches/ruby_1_8/
  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/open-uri.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22150)
+++ ruby_1_8/ChangeLog	(revision 22151)
@@ -4,6 +4,8 @@
 	  [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@f...>
 
Index: ruby_1_8/lib/open-uri.rb
===================================================================
--- ruby_1_8/lib/open-uri.rb	(revision 22150)
+++ ruby_1_8/lib/open-uri.rb	(revision 22151)
@@ -170,7 +170,7 @@
     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

Property changes on: ruby_1_8
___________________________________________________________________
Name: svk:merge
   - 050cfa88-b445-4b2e-b226-957b86f2c464:/local/ruby/1.8:22139
b2dd03c8-39d4-4d8f-98ff-823fe69b080e:/trunk:5286
   + 050cfa88-b445-4b2e-b226-957b86f2c464:/local/ruby/1.8:22140
b2dd03c8-39d4-4d8f-98ff-823fe69b080e:/trunk:5286


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/