Skip to content
Browse files

Fixed that file.content_type for uploaded files would include a trail…

…ing \r #9053 [bgreenlee]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 80150a0 commit 937a7abe4556f06e056af33c40a07c3b58652ed7 @dhh dhh committed
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that file.content_type for uploaded files would include a trailing \r #9053 [bgreenlee]
+
* url_for now accepts a series of symbols representing the namespace of the record [Josh Knowles]
* Make :trailing_slash work with query parameters for url_for. Closes #4004 [nov]
View
2 actionpack/lib/action_controller/request.rb
@@ -542,7 +542,7 @@ def read_multipart(body, boundary, content_length, env)
filename = CGI.unescape(filename)
end
- /Content-Type: (.*)/ni.match(head)
+ /Content-Type: ([^\r]*)/ni.match(head)
content_type = ($1 or "")
(class << content; self; end).class_eval do
View
6 actionpack/test/controller/request_test.rb
@@ -667,7 +667,7 @@ def test_text_file
file = params['file']
assert_kind_of StringIO, file
assert_equal 'file.txt', file.original_filename
- assert_equal "text/plain\r", file.content_type
+ assert_equal "text/plain", file.content_type
assert_equal 'contents', file.read
end
@@ -679,7 +679,7 @@ def test_large_text_file
file = params['file']
assert_kind_of Tempfile, file
assert_equal 'file.txt', file.original_filename
- assert_equal "text/plain\r", file.content_type
+ assert_equal "text/plain", file.content_type
assert ('a' * 20480) == file.read
end
@@ -697,7 +697,7 @@ def test_binary_file
file = params['flowers']
assert_kind_of StringIO, file
assert_equal 'flowers.jpg', file.original_filename
- assert_equal "image/jpeg\r", file.content_type
+ assert_equal "image/jpeg", file.content_type
assert_equal 19512, file.size
#assert_equal File.read(File.dirname(__FILE__) + '/../../../activerecord/test/fixtures/flowers.jpg'), file.read
end

0 comments on commit 937a7ab

Please sign in to comment.
Something went wrong with that request. Please try again.