Permalink
Browse files

Dont set default charset if the response is sending a file. Closes #6689

 [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5626 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent cf248ea commit 396b3f2befe5d75ac04e732eae195dc6d9d20201 @dhh dhh committed Nov 25, 2006
Showing with 13 additions and 1 deletion.
  1. +5 −1 actionpack/lib/action_controller/base.rb
  2. +8 −0 actionpack/test/controller/send_file_test.rb
@@ -1087,7 +1087,11 @@ def assign_names
def assign_default_content_type_and_charset
response.content_type ||= Mime::HTML
- response.charset ||= self.class.default_charset
+ response.charset ||= self.class.default_charset unless sending_file?
+ end
+
+ def sending_file?
+ response.headers["Content-Transfer-Encoding"] == "binary"
end
def action_methods
@@ -63,6 +63,14 @@ def test_data
assert_equal file_data, response.body
end
+ def test_headers_after_send_shouldnt_include_charset
+ response = process('data')
+ assert_equal "application/octet-stream", response.headers["Content-Type"]
+
+ response = process('file')
+ assert_equal "application/octet-stream", response.headers["Content-Type"]
+ end
+
# Test that send_file_headers! is setting the correct HTTP headers.
def test_send_file_headers!
options = {

0 comments on commit 396b3f2

Please sign in to comment.