nobu	2010-01-12 16:48:48 +0900 (Tue, 12 Jan 2010)

  New Revision: 26301

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

  Log:
    * lib/net/http.rb (Net::HTTP.start): options may not be given.

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/http.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26300)
+++ ChangeLog	(revision 26301)
@@ -1,3 +1,7 @@
+Tue Jan 12 16:48:46 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/net/http.rb (Net::HTTP.start): options may not be given.
+
 Tue Jan 12 16:48:03 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/readline/readline.c (readline_readline): check if instream
Index: lib/net/http.rb
===================================================================
--- lib/net/http.rb	(revision 26300)
+++ lib/net/http.rb	(revision 26301)
@@ -471,14 +471,16 @@
     def HTTP.start(address, *arg, &block) # :yield: +http+
       arg.pop if opt = Hash.try_convert(arg[-1])
       port, p_addr, p_port, p_user, p_pass = *arg
-      port = https_default_port if opt[:use_ssl] && !port
+      port = https_default_port if !port && opt && opt[:use_ssl]
       http = new(address, port, p_addr, p_port, p_user, p_pass)
 
-      opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl]
-      http.methods.grep(/\A(\w+)=\z/) do |meth|
-        key = $1.to_sym
-        opt.key?(key) or next
-        http.__send__(meth, opt[key])
+      if opt
+        opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl]
+        http.methods.grep(/\A(\w+)=\z/) do |meth|
+          key = $1.to_sym
+          opt.key?(key) or next
+          http.__send__(meth, opt[key])
+        end
       end
 
       http.start(&block)

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