kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/webrick/httpresponse.rb: Move error_body to method. It allow to

Browse source 
override the body more easily. [fix GH-1307]
* test/webrick/test_httpresponse.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2016-03-29 03:45:32 +00:00
parent 7504be10ef
commit c2355aefc9
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Mar 29 12:45:18 2016 Laurent Arnoud <laurent@spkdev.net>
* lib/webrick/httpresponse.rb: Move error_body to method. It allow to
override the body more easily. [fix GH-1307]
* test/webrick/test_httpresponse.rb: ditto.
Tue Mar 29 06:40:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Mar 29 06:40:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (rb_compile_err_append): rb_thread_t::base_block is no * error.c (rb_compile_err_append): rb_thread_t::base_block is no

12
lib/webrick/httpresponse.rb
View file

@ -352,6 +352,14 @@ module WEBrick
host, port = @config[:ServerName], @config[:Port] host, port = @config[:ServerName], @config[:Port]
end end
error_body(backtrace, ex, host, port)
end
private
# :stopdoc:
def error_body(backtrace, ex, host, port)
@body = '' @body = ''
@body << <<-_end_of_html_ @body << <<-_end_of_html_
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
@ -381,10 +389,6 @@ module WEBrick
_end_of_html_ _end_of_html_
end end
private
# :stopdoc:
def send_body_io(socket) def send_body_io(socket)
begin begin
if @request_method == "HEAD" if @request_method == "HEAD"

10
test/webrick/test_httpresponse.rb
View file

@ -146,5 +146,15 @@ module WEBrick
} }
assert_equal 0, logger.messages.length assert_equal 0, logger.messages.length
end end
def test_set_error
status = 400
message = 'missing attribute'
@res.status = status
error = WEBrick::HTTPStatus[status].new(message)
body = @res.set_error(error)
assert_match(/#{@res.reason_phrase}/, body)
assert_match(/#{message}/, body)
end
end end
end end