From 49b825e502d57f10aa2cee10c1d631a95f3cef64 Mon Sep 17 00:00:00 2001 From: Matias Korhonen Date: Tue, 3 May 2011 16:30:59 +0300 Subject: Sets the HTTP charset parameter for rescue response. --- actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 2 +- actionpack/test/dispatch/show_exceptions_test.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'actionpack') 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 diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb index e453dd11ce..cc57a6cba0 100644 --- a/actionpack/test/dispatch/show_exceptions_test.rb +++ b/actionpack/test/dispatch/show_exceptions_test.rb @@ -137,4 +137,11 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest assert_response 500 assert_match(/RuntimeError\n in FeaturedTilesController/, body) end + + test "sets the HTTP charset parameter" do + @app = DevelopmentApp + + get "/", {}, {'action_dispatch.show_exceptions' => true} + assert_equal "text/html; charset=utf-8", response.headers["Content-Type"] + end end -- cgit v1.2.3