use Array#join so that file encoding doesn't impact returned string.

Fixes rails#3957
Backoo · Dec 13, 2011 · 4371be2 · 4371be2
1 parent 25ac7e4
commit 4371be2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
@@ -108,9 +108,9 @@ def to_path
     end
 
     def body
-      str = ''
-      each { |part| str << part.to_s }
-      str
+      strings = []
+      each { |part| strings << part.to_s }
+      strings.join
     end
 
     EMPTY = " "

diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
@@ -5,6 +5,15 @@ def setup
     @response = ActionDispatch::Response.new
   end
 
+  def test_response_body_encoding
+    # FIXME: remove this conditional on Rails 4.0
+    return unless "<3".encoding_aware?
+
+    body = ["hello".encode('utf-8')]
+    response = ActionDispatch::Response.new 200, {}, body
+    assert_equal Encoding::UTF_8, response.body.encoding
+  end
+
   test "simple output" do
     @response.body = "Hello, World!"