diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-12-06 23:06:38 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-12-06 23:06:38 +0000 |
| commit | 91d99e2f5312688d99583a2ed5a08e17022a4218 (patch) | |
| tree | f526f06e96195a8038fd5ee2ac5566308bbe4f47 /actionpack/lib/action_controller/mime_types.rb | |
| parent | 42596543dc0bac7aad9763b82ee4cc2b17f3110c (diff) | |
| download | rails-91d99e2f5312688d99583a2ed5a08e17022a4218.tar.gz rails-91d99e2f5312688d99583a2ed5a08e17022a4218.tar.bz2 rails-91d99e2f5312688d99583a2ed5a08e17022a4218.zip | |
More thorough JSON tests. Use application/json by default, per rfc4627. References #4185.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5695 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/mime_types.rb')
| -rw-r--r-- | actionpack/lib/action_controller/mime_types.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/mime_types.rb b/actionpack/lib/action_controller/mime_types.rb index 4b6a00da1d..bc458d85fa 100644 --- a/actionpack/lib/action_controller/mime_types.rb +++ b/actionpack/lib/action_controller/mime_types.rb @@ -2,10 +2,12 @@ Mime::Type.register "*/*", :all Mime::Type.register "text/plain", :text Mime::Type.register "text/html", :html, %w( application/xhtml+xml ), %w( xhtml ) Mime::Type.register "text/javascript", :js, %w( application/javascript application/x-javascript ) -Mime::Type.register "text/x-json", :json, %w( application/x-json ) Mime::Type.register "text/calendar", :ics Mime::Type.register "text/csv", :csv Mime::Type.register "application/xml", :xml, %w( text/xml application/x-xml ) Mime::Type.register "application/rss+xml", :rss Mime::Type.register "application/atom+xml", :atom -Mime::Type.register "application/x-yaml", :yaml, %w( text/yaml )
\ No newline at end of file +Mime::Type.register "application/x-yaml", :yaml, %w( text/yaml ) + +# http://www.ietf.org/rfc/rfc4627.txt +Mime::Type.register "application/json", :json, %w( text/x-json ) |