diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-01 21:31:34 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-01 21:31:34 -0700 |
| commit | 0d41d6956f3dda7e8eb133b623bcfd6ad1eb41a1 (patch) | |
| tree | 446a72d24555c382f2d07d7743f245d5f5cb7a9f /actionpack/lib | |
| parent | cfc0ca0516d818bffdd5959ebe415362965d2de0 (diff) | |
| parent | 561edbe71ff70abc3c0c63c6c05770b434f9b0a9 (diff) | |
| download | rails-0d41d6956f3dda7e8eb133b623bcfd6ad1eb41a1.tar.gz rails-0d41d6956f3dda7e8eb133b623bcfd6ad1eb41a1.tar.bz2 rails-0d41d6956f3dda7e8eb133b623bcfd6ad1eb41a1.zip | |
Merge pull request #7636 from steveklabnik/issue_5660
Fixes issue #5660: Failsafe exception returns text/html and text/plain.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 6 |
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 |