aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/mime_types.rb
diff options
context:
space:
mode:
authorMike Subelsky <github@mikeshop.net>2008-07-02 14:15:43 -0400
committerrick <technoweenie@gmail.com>2008-07-02 11:39:42 -0700
commit8f640c381d9d1b74f6a0fc3648c21da373661914 (patch)
treed179b1200ce573847076301646fac854e66b11ab /actionpack/lib/action_controller/mime_types.rb
parenta4138d46321d63012adbf1942f5ea7c5e4951fc9 (diff)
downloadrails-8f640c381d9d1b74f6a0fc3648c21da373661914.tar.gz
rails-8f640c381d9d1b74f6a0fc3648c21da373661914.tar.bz2
rails-8f640c381d9d1b74f6a0fc3648c21da373661914.zip
Added application/jsonrequest as a synonym for application/json
[#536 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller/mime_types.rb')
-rw-r--r--actionpack/lib/action_controller/mime_types.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/mime_types.rb b/actionpack/lib/action_controller/mime_types.rb
index 01a266d3fe..2d7fba1173 100644
--- a/actionpack/lib/action_controller/mime_types.rb
+++ b/actionpack/lib/action_controller/mime_types.rb
@@ -17,4 +17,5 @@ Mime::Type.register "multipart/form-data", :multipart_form
Mime::Type.register "application/x-www-form-urlencoded", :url_encoded_form
# http://www.ietf.org/rfc/rfc4627.txt
-Mime::Type.register "application/json", :json, %w( text/x-json ) \ No newline at end of file
+# http://www.json.org/JSONRequest.html
+Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest ) \ No newline at end of file