aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2012-07-05 22:39:15 -0700
committerSteve Klabnik <steve@steveklabnik.com>2012-10-01 21:30:21 -0700
commit561edbe71ff70abc3c0c63c6c05770b434f9b0a9 (patch)
tree446a72d24555c382f2d07d7743f245d5f5cb7a9f /actionpack/lib/action_dispatch/middleware
parentcfc0ca0516d818bffdd5959ebe415362965d2de0 (diff)
downloadrails-561edbe71ff70abc3c0c63c6c05770b434f9b0a9.tar.gz
rails-561edbe71ff70abc3c0c63c6c05770b434f9b0a9.tar.bz2
rails-561edbe71ff70abc3c0c63c6c05770b434f9b0a9.zip
Failsafe exception returns text/plain.
It's best to just return text/plain when something has gone terribly wrong. Fixes #5660.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r--actionpack/lib/action_dispatch/middleware/show_exceptions.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index ab740a0190..402f29cd76 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -15,11 +15,11 @@ module ActionDispatch
# If any exception happens inside the exceptions app, this middleware
# catches the exceptions and returns a FAILSAFE_RESPONSE.
class ShowExceptions
- FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
- ["<html><body><h1>500 Internal Server Error</h1>" <<
+ FAILSAFE_RESPONSE = [500, { 'Content-Type' => 'text/plain' },
+ ["500 Internal Server Error\n" <<
"If you are the administrator of this website, then please read this web " <<
"application's log file and/or the web server's log file to find out what " <<
- "went wrong.</body></html>"]]
+ "went wrong."]]
def initialize(app, exceptions_app)
@app = app