aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/dispatcher.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/dispatcher.rb')
-rw-r--r--railties/lib/dispatcher.rb4
1 files changed, 2 insertions, 2 deletions
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