diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-03 06:44:01 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-03 06:44:01 -0700 |
| commit | 7ae3b82ceb83827a6f1c22ee6a6dbcfa0c44d13b (patch) | |
| tree | b26a52e2e31bab2314a42b6f03ea53d98d71e780 /actionpack/lib/action_dispatch/middleware/show_exceptions.rb | |
| parent | 1ca81238b5abcbdad667d45a588fdb1f68a0516e (diff) | |
| parent | 49b825e502d57f10aa2cee10c1d631a95f3cef64 (diff) | |
| download | rails-7ae3b82ceb83827a6f1c22ee6a6dbcfa0c44d13b.tar.gz rails-7ae3b82ceb83827a6f1c22ee6a6dbcfa0c44d13b.tar.bz2 rails-7ae3b82ceb83827a6f1c22ee6a6dbcfa0c44d13b.zip | |
Merge pull request #375 from k33l0r/master.
Google Chrome sometimes incorrectly identifies the rescues template charset
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/show_exceptions.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index b1adf3d2d1..c17c746096 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -116,7 +116,7 @@ module ActionDispatch end def render(status, body) - [status, {'Content-Type' => 'text/html', 'Content-Length' => body.bytesize.to_s}, [body]] + [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]] end def public_path |