From 4fcc6f1ef1428f6357150695843ca314c6e1d5a1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Jun 2010 21:15:33 +0000
Subject: * lib/un.rb (setup): fix of word splitting.  [ruby-dev:41723]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/un.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/un.rb')

diff --git a/lib/un.rb b/lib/un.rb
index 907b80c0ab..1c52c2f469 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -45,7 +45,8 @@ def setup(options = "", *long_options)
     long_options.each do |s|
       opt_name, arg_name = s.split(/(?=[\s=])/, 2)
       opt_name.sub!(/\A--/, '')
-      s = "--#{opt_name.gsub(/([A-Za-z]+)([A-Z])/, '\1-\2').downcase}#{arg_name}"
+      s = "--#{opt_name.gsub(/([A-Z]+|[a-z])([A-Z])/, '\1-\2').downcase}#{arg_name}"
+      puts "#{opt_name}=>#{s}" if $DEBUG
       opt_name = opt_name.intern
       o.on(s) do |val|
         opt_hash[opt_name] = val
@@ -307,7 +308,9 @@ def httpd
     |argv, options|
     require 'webrick'
     opt = options[:RequestTimeout] and options[:RequestTimeout] = opt.to_i
-    opt = options[:Port] and (options[:Port] = Integer(opt)) rescue nil
+    [:Port, :MaxClients].each do |name|
+      opt = options[name] and (options[name] = Integer(opt)) rescue nil
+    end
     unless argv.empty?
       options[:DocumentRoot] = argv.shift
     end
-- 
cgit v1.2.3