aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 03:45:32 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 03:45:32 +0000
commitc2355aefc99a03b8f42d2fca44c08983bdbdd087 (patch)
tree8b9f08252c729480a03669d6ccc1840b92a46c1b /lib
parent7504be10efbc6002cdfe205c05a7f2690c368296 (diff)
downloadruby-c2355aefc99a03b8f42d2fca44c08983bdbdd087.tar.gz
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/webrick/httpresponse.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
index 5fd54b77c7..eae14d6597 100644
--- a/lib/webrick/httpresponse.rb
+++ b/lib/webrick/httpresponse.rb
@@ -352,6 +352,14 @@ module WEBrick
host, port = @config[:ServerName], @config[:Port]
end
+ error_body(backtrace, ex, host, port)
+ end
+
+ private
+
+ # :stopdoc:
+
+ def error_body(backtrace, ex, host, port)
@body = ''
@body << <<-_end_of_html_
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
@@ -381,10 +389,6 @@ module WEBrick
_end_of_html_
end
- private
-
- # :stopdoc:
-
def send_body_io(socket)
begin
if @request_method == "HEAD"