From 50c99dc9c730ed6554cd75da84976b72f6f36be7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 Jan 2010 04:30:37 +0000
Subject: * lib/webrick/accesslog.rb (WEBrick::AccessLog#format): fixed typo.

* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status#initialize):
  accept 0 or more arguments.  [ruby-dev:40021]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/webrick/accesslog.rb  | 2 +-
 lib/webrick/httpstatus.rb | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/webrick/accesslog.rb b/lib/webrick/accesslog.rb
index 75a3a3e694..0bed8097d5 100644
--- a/lib/webrick/accesslog.rb
+++ b/lib/webrick/accesslog.rb
@@ -53,7 +53,7 @@ module WEBrick
          when ?e, ?i, ?n, ?o
            raise AccessLogError,
              "parameter is required for \"#{spec}\"" unless param
-           param = params[spec][param] ? escape(param) : "-"
+           (param = params[spec][param]) ? escape(param) : "-"
          when ?t
            params[spec].strftime(param || CLF_TIME_FORMAT)
          when ?%
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb
index 0098749f83..6623983f87 100644
--- a/lib/webrick/httpstatus.rb
+++ b/lib/webrick/httpstatus.rb
@@ -12,9 +12,10 @@ module WEBrick
 
   module HTTPStatus
 
-    class Status      < StandardError
-      def initialize(message, *rest)
-        super(AccessLog.escape(message), *rest)
+    class Status < StandardError
+      def initialize(*args)
+        args[0] = AccessLog.escape(args[0]) unless args.empty?
+        super(*args)
       end
       class << self
         attr_reader :code, :reason_phrase
-- 
cgit v1.2.3