ruby-changes:14286
From: nobu <ko1@a...>
Date: Wed, 16 Dec 2009 16:58:23 +0900 (JST)
Subject: [ruby-changes:14286] Ruby:r26111 (trunk, ruby_1_8): * lib/un.rb (httpd): try to convert port number to integer.
nobu 2009-12-16 16:58:01 +0900 (Wed, 16 Dec 2009) New Revision: 26111 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26111 Log: * lib/un.rb (httpd): try to convert port number to integer. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/lib/un.rb trunk/ChangeLog trunk/lib/un.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 26110) +++ ChangeLog (revision 26111) @@ -1,3 +1,7 @@ +Wed Dec 16 16:57:59 2009 Nobuyoshi Nakada <nobu@r...> + + * lib/un.rb (httpd): try to convert port number to integer. + Wed Dec 16 11:18:30 2009 WATANABE Hirofumi <eban@r...> * configure.in(MINIRUBY): use "$BASERUBY" as a default ruby executable Index: lib/un.rb =================================================================== --- lib/un.rb (revision 26110) +++ lib/un.rb (revision 26111) @@ -304,6 +304,7 @@ |argv, options| require 'webrick' opt = options[:RequestTimeout] and options[:RequestTimeout] = opt.to_i + opt = options[:Port] and (options[:Port] = Integer(opt)) rescue nil unless argv.empty? options[:DocumentRoot] = argv.shift end Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 26110) +++ ruby_1_8/ChangeLog (revision 26111) @@ -1,3 +1,7 @@ +Wed Dec 16 16:57:59 2009 Nobuyoshi Nakada <nobu@r...> + + * lib/un.rb (httpd): try to convert port number to integer. + Wed Dec 16 15:05:42 2009 Nobuyoshi Nakada <nobu@r...> * lib/un.rb (wait_writable): wait until target files can be Index: ruby_1_8/lib/un.rb =================================================================== --- ruby_1_8/lib/un.rb (revision 26110) +++ ruby_1_8/lib/un.rb (revision 26111) @@ -304,6 +304,7 @@ |argv, options| require 'webrick' opt = options[:RequestTimeout] and options[:RequestTimeout] = opt.to_i + opt = options[:Port] and (options[:Port] = Integer(opt)) rescue nil unless argv.empty? options[:DocumentRoot] = argv.shift end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/