diff options
Diffstat (limited to 'actionpack')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 3 | ||||
| -rw-r--r-- | actionpack/test/controller/request_test.rb | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index cc469e2e74..38584a6481 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -58,7 +58,8 @@ module ActionController def content_type @content_type ||= begin - content_type = @env['CONTENT_TYPE'].to_s.downcase + # Receive header sans any charset information. + content_type = @env['CONTENT_TYPE'].to_s.sub(/\s*\;.*$/, '').strip.downcase if x_post_format = @env['HTTP_X_POST_DATA_FORMAT'] case x_post_format.to_s.downcase diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb index 59297a798c..4914df679c 100644 --- a/actionpack/test/controller/request_test.rb +++ b/actionpack/test/controller/request_test.rb @@ -323,6 +323,25 @@ class RequestTest < Test::Unit::TestCase @request.env["HTTP_ACCEPT"] = "text/javascript" assert_equal Mime::JS, @request.format end + + def test_content_type + @request.env["CONTENT_TYPE"] = "text/html" + assert_equal Mime::HTML, @request.content_type + end + + def test_content_no_type + assert_equal nil, @request.content_type + end + + def test_content_type_xml + @request.env["CONTENT_TYPE"] = "application/xml" + assert_equal Mime::XML, @request.content_type + end + + def test_content_type_with_charset + @request.env["CONTENT_TYPE"] = "application/xml; charset=UTF-8" + assert_equal Mime::XML, @request.content_type + end protected def set_request_method_to(method) |