0
@@ -17,4 +17,5 @@ Mime::Type.register "multipart/form-data", :multipart_form
0
 Mime::Type.register "application/x-www-form-urlencoded", :url_encoded_form
0
 
0
 # http://www.ietf.org/rfc/rfc4627.txt
0
-Mime::Type.register "application/json", :json, %w( text/x-json )
0
\ No newline at end of file
0
+# http://www.json.org/JSONRequest.html
0
+Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest )
0
\ No newline at end of file

0
@@ -909,15 +909,21 @@ class LegacyXmlParamsParsingTest < XmlParamsParsingTest
0
 end
0
 
0
 class JsonParamsParsingTest < Test::Unit::TestCase
0
-  def test_hash_params
0
-    person = parse_body({:person => {:name => "David"}}.to_json)[:person]
0
+  def test_hash_params_for_application_json
0
+    person = parse_body({:person => {:name => "David"}}.to_json,'application/json')[:person]
0
+    assert_kind_of Hash, person
0
+    assert_equal 'David', person['name']
0
+  end
0
+
0
+  def test_hash_params_for_application_jsonrequest
0
+    person = parse_body({:person => {:name => "David"}}.to_json,'application/jsonrequest')[:person]
0
     assert_kind_of Hash, person
0
     assert_equal 'David', person['name']
0
   end
0
 
0
   private
0
-    def parse_body(body)
0
-      env = { 'CONTENT_TYPE'   => 'application/json',
0
+    def parse_body(body,content_type)
0
+      env = { 'CONTENT_TYPE'   => content_type,
0
               'CONTENT_LENGTH' => body.size.to_s }
0
       cgi = ActionController::Integration::Session::StubCGI.new(env, body)
0
       ActionController::CgiRequest.new(cgi).request_parameters