From e320f28945290b527a5634ea473b5a8543d5ab0a Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Wed, 8 Mar 2006 14:33:07 +0000 Subject: Make the 3rd arg optional for #failsafe_response git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3815 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/dispatcher.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/dispatcher.rb') diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index f3350087ad..d5e0345dd5 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -85,13 +85,13 @@ class Dispatcher end # If the block raises, send status code as a last-ditch response. - def failsafe_response(output, status, exception) + def failsafe_response(output, status, exception = nil) yield rescue Object begin output.write "Status: #{status}\r\n" output.write "Content-Type: text/plain\r\n\r\n" - output.write exception.to_s + "\r\n" + exception.backtrace.join("\r\n") + output.write exception.to_s + "\r\n" + exception.backtrace.join("\r\n") if exception rescue Object end end -- cgit v1.2.3