TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #375 from k33l0r/master.

Browse Source 
Google Chrome sometimes incorrectly identifies the rescues template charset
This commit is contained in:
José Valim 2011-05-03 06:44:01 -07:00
commit 7ae3b82ceb
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/middleware/show_exceptions.rb
View File

@ -116,7 +116,7 @@ def status_code(exception)
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

6
actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
View File

@ -1,11 +1,13 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>Action Controller: Exception caught</title>
<style>
body { background-color: #fff; color: #333; }
body, p, ol, ul, td {
font-family: verdana, arial, helvetica, sans-serif;
font-family: helvetica, verdana, arial, sans-serif;
font-size: 13px;
line-height: 18px;
}

7
actionpack/test/dispatch/show_exceptions_test.rb
View File

@ -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