summaryrefslogtreecommitdiff
path: root/lib/webrick
diff options
context:
space:
mode:
Diffstat (limited to 'lib/webrick')
-rw-r--r--lib/webrick/accesslog.rb2
-rw-r--r--lib/webrick/httpstatus.rb7
2 files changed, 5 insertions, 4 deletions
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 77a1d3ee50..a49be32be9 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