aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-11-13 23:08:19 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-11-13 23:09:08 -0500
commit5f3222155957e887516ffd4be58c4743553415b5 (patch)
tree591328d042686230b1ffcb502aaa79a8df44d79b
parentf1c5b0bd0a6211286bfbb8f46991de325d45a2e5 (diff)
parent773f71c8a0d61a01b8afcc7359e0364a1f2a1bce (diff)
downloadrails-5f3222155957e887516ffd4be58c4743553415b5.tar.gz
rails-5f3222155957e887516ffd4be58c4743553415b5.tar.bz2
rails-5f3222155957e887516ffd4be58c4743553415b5.zip
Merge pull request #27007 from maclover7/jm-fix-26912
Don't error on an empty CONTENT_TYPE
-rw-r--r--actionpack/lib/action_dispatch/http/mime_negotiation.rb4
-rw-r--r--actionpack/test/controller/params_wrapper_test.rb10
2 files changed, 12 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index d0c9413efa..e5f20003a3 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -29,8 +29,8 @@ module ActionDispatch
content_mime_type && content_mime_type.to_s
end
- def has_content_type?
- has_header? "CONTENT_TYPE"
+ def has_content_type? # :nodoc:
+ get_header "CONTENT_TYPE"
end
# Returns the accepted MIME type for the request.
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 1549405fe7..46a2ab8ccf 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -212,6 +212,16 @@ class ParamsWrapperTest < ActionController::TestCase
)
end
end
+
+ def test_handles_empty_content_type
+ with_default_wrapper_options do
+ @request.env["CONTENT_TYPE"] = nil
+ _controller_class.dispatch(:parse, @request, @response)
+
+ assert_equal 200, @response.status
+ assert_equal "", @response.body
+ end
+ end
end
class NamespacedParamsWrapperTest < ActionController::TestCase