From 067361e317cde0638b0497f7088424bc1c4539bf Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 10 Jun 2010 05:23:49 +0000 Subject: * lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status::initialize): accept 0 or more arguments. [ruby-core:28692] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/webrick/httpstatus.rb | 5 +++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ca6772eab..66ec395423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 10 14:22:09 2010 URABE Shyouhei + + * lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status::initialize): + accept 0 or more arguments. [ruby-core:28692] + Thu Jun 10 13:37:35 2010 Nobuyoshi Nakada * eval.c (rb_load): initialize orig_func. [ruby-core:27296] diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb index 032d14b8a3..fcc42f36aa 100644 --- a/lib/webrick/httpstatus.rb +++ b/lib/webrick/httpstatus.rb @@ -13,8 +13,9 @@ module WEBrick module HTTPStatus class Status < StandardError - def initialize(message=self.class, *rest) - super(AccessLog.escape(message), *rest) + def initialize(*args) + args[0] = AccessLog.escape(args[0]) unless args.empty? + super(*args) end class << self attr_reader :code, :reason_phrase diff --git a/version.h b/version.h index 37f15bc0b3..974c2b5cdf 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-06-10" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20100610 -#define RUBY_PATCHLEVEL 292 +#define RUBY_PATCHLEVEL 293 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3