kotovalexarian-likes-github
/
sinatra
mirror of https://github.com/sinatra/sinatra
1
0
Fork 0
Code Releases Activity

Remove charset from JSON mime-type 

The IETF RFC establishes that the charset parameter on the JSON
mime-type is not a required or an optional parameter.

Reference: http://www.ietf.org/rfc/rfc4627.txt
This commit is contained in:
Sebastian Borrazas 2013-11-10 19:29:35 -02:00
parent c9fdd9e297
commit 4c7e9b6617
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sinatra/base.rb
View File

@ -1828,7 +1828,7 @@ module Sinatra
set :use_code, false
set :default_encoding, "utf-8"
set :x_cascade, true
set :add_charset, %w[javascript xml xhtml+xml json].map { |t| "application/#{t}" }
set :add_charset, %w[javascript xml xhtml+xml].map { |t| "application/#{t}" }
settings.add_charset << /^text\//
# explicitly generating a session secret eagerly to play nice with preforking

6
test/helpers_test.rb
View File

@ -334,13 +334,13 @@ class HelpersTest < Test::Unit::TestCase
it 'should not reset the content-type to html for error handlers' do
mock_app do
disable :raise_errors
before { content_type "application/json;charset=utf-8" }
before { content_type "application/json" }
not_found { JSON.dump("error" => "Not Found") }
end
get '/'
assert_equal 404, status
assert_equal 'application/json;charset=utf-8', response.content_type
assert_equal 'application/json', response.content_type
end
it 'should not invoke error handler when halting with 500 inside an error handler' do
@ -665,7 +665,7 @@ class HelpersTest < Test::Unit::TestCase
assert_equal content_type(:xml), 'application/xml;charset=utf-8'
assert_equal content_type(:xhtml), 'application/xhtml+xml;charset=utf-8'
assert_equal content_type(:js), 'application/javascript;charset=utf-8'
assert_equal content_type(:json), 'application/json;charset=utf-8'
assert_equal content_type(:json), 'application/json'
assert_equal content_type(:bar), 'application/bar'
assert_equal content_type(:png), 'image/png'
assert_equal content_type(:baz), 'application/baz;charset=utf-8'