diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-10 10:30:06 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-10 10:30:06 +0000 |
commit | f2d2dfe9ca4a50bc88a5c3ff8242433f82ea7e75 (patch) | |
tree | f9cf394acdc254b3b19fa54095c08724368ca580 /lib/webrick/httpstatus.rb | |
parent | a8d1b863352a05459efbb29eab0c1a838baef133 (diff) |
merge revision(s) 26267:
* lib/webrick/accesslog.rb : Escape needed.
* lib/webrick/httpstatus.rb : ditto.
* lib/webrick/httprequest.rb : ditto.
* lib/webrick/httputils.rb : ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httpstatus.rb')
-rw-r--r-- | lib/webrick/httpstatus.rb | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb index 0b22c992b3..032d14b8a3 100644 --- a/lib/webrick/httpstatus.rb +++ b/lib/webrick/httpstatus.rb @@ -12,7 +12,17 @@ module WEBrick module HTTPStatus - class Status < StandardError; end + class Status < StandardError + def initialize(message=self.class, *rest) + super(AccessLog.escape(message), *rest) + end + class << self + attr_reader :code, :reason_phrase + end + def code() self::class::code end + def reason_phrase() self::class::reason_phrase end + alias to_i code + end class Info < Status; end class Success < Status; end class Redirect < Status; end @@ -68,6 +78,7 @@ module WEBrick CodeToError = {} StatusMessage.each{|code, message| + message.freeze var_name = message.gsub(/[ \-]/,'_').upcase err_name = message.gsub(/[ \-]/,'') @@ -79,18 +90,12 @@ module WEBrick when 500...600; parent = ServerError end - eval %- - RC_#{var_name} = #{code} - class #{err_name} < #{parent} - def self.code() RC_#{var_name} end - def self.reason_phrase() StatusMessage[code] end - def code() self::class::code end - def reason_phrase() self::class::reason_phrase end - alias to_i code - end - - - - CodeToError[code] = const_get(err_name) + const_set("RC_#{var_name}", code) + err_class = Class.new(parent) + err_class.instance_variable_set(:@code, code) + err_class.instance_variable_set(:@reason_phrase, message) + const_set(err_name, err_class) + CodeToError[code] = err_class } def reason_phrase(code) |