summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-03 08:22:45 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-03 08:22:45 +0000
commita580c01dc0b40a4c69d016113f2761e6e88de924 (patch)
tree93e25b2b3c369593a7bb3243aa9b186d244bbdbe
parent5b657b5dcb70581778d7c0a9598bbf08e10e7002 (diff)
un.rb: DocumentRoot
* lib/un.rb (httpd): document root is mandatory. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/un.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/un.rb b/lib/un.rb
index 0a2e37277a..a07454135c 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -311,9 +311,10 @@ def httpd
[:Port, :MaxClients].each do |name|
opt = options[name] and (options[name] = Integer(opt)) rescue nil
end
- unless argv.empty?
- options[:DocumentRoot] = argv.shift
+ unless argv.size == 1
+ raise ArgumentError, "DocumentRoot is mandatory"
end
+ options[:DocumentRoot] = argv.shift
s = WEBrick::HTTPServer.new(options)
shut = proc {s.shutdown}
Signal.trap("TERM", shut)