Merge branch 'master' of git://github.com/rails/rails

1 files changed, 9 insertions, 1 deletions

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 78ecf177be..1f4f3ac0da 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -118,7 +118,15 @@ module ActionDispatch # :nodoc:
 
     def body=(body)
       @blank = true if body == EMPTY
-      @body = body.respond_to?(:each) ? body : [body]
+
+      # Explicitly check for strings. This is *wrong* theoretically
+      # but if we don't check this, the performance on string bodies
+      # is bad on Ruby 1.8 (because strings responds to each then).
+      @body = if body.respond_to?(:to_str) || !body.respond_to?(:each)
+        [body]
+      else
+        body
+      end
     end
 
     def body_parts