github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use default charset when we read content type without charset.

Browse Source
This commit is contained in:
kennyj
2011-12-07 01:46:41 +09:00
parent 9be2353fac
commit a1986e7d55
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/http/response.rb
View File

@@ -69,7 +69,7 @@ module ActionDispatch # :nodoc:
if content_type = self["Content-Type"]
type, charset = content_type.split(/;\s*charset=/)
@content_type = Mime::Type.lookup(type)
@charset = charset || "UTF-8"
@charset = charset || self.class.default_charset
end
prepare_cache_control!

11
actionpack/test/dispatch/response_test.rb
View File

@@ -130,6 +130,17 @@ class ResponseTest < ActiveSupport::TestCase
assert_equal('application/xml; charset=utf-16', resp.headers['Content-Type'])
end
test "read content type without charset" do
original = ActionDispatch::Response.default_charset
begin
ActionDispatch::Response.default_charset = 'utf-16'
resp = ActionDispatch::Response.new(200, { "Content-Type" => "text/xml" })
assert_equal('utf-16', resp.charset)
ensure
ActionDispatch::Response.default_charset = original
end
end
end
class ResponseIntegrationTest < ActionDispatch::IntegrationTest