2.2.8

lib/rack/mock.rb

@@ -212,8 +212,15 @@ def body
       #   end
       buffer = String.new
 
-      super.each do |chunk|
-        buffer << chunk
+      body = super
+      body = body.body if body.respond_to?(:body)
+
+      if body.respond_to?(:each)
+        body.each do |chunk|
+          buffer << chunk
+        end
+      else
+        buffer = body.to_s
       end
 
       return buffer

lib/rack/response.rb

@@ -254,37 +254,42 @@ def etag
         get_header ETAG
       end
 
-      def etag=(v)
-        set_header ETAG, v
+      def etag=(value)
+        set_header ETAG, value
       end
 
     protected
 
       def buffered_body!
-        return if @buffered
-
-        if @body.is_a?(Array)
-          # The user supplied body was an array:
-          @body = @body.compact
-          @body.each do |part|
-            @length += part.to_s.bytesize
-          end
-        else
-          # Turn the user supplied body into a buffered array:
-          body = @body
-          @body = Array.new
-
-          body.each do |part|
-            @writer.call(part.to_s)
+        if @buffered.nil?
+          if @body.is_a?(Array)
+            # The user supplied body was an array:
+            @body = @body.compact
+            @body.each do |part|
+              @length += part.to_s.bytesize
+            end
+          elsif @body.respond_to?(:each)
+            # Turn the user supplied body into a buffered array:
+            body = @body
+            @body = Array.new
+
+            body.each do |part|
+              @writer.call(part.to_s)
+            end
+
+            body.close if body.respond_to?(:close)
+
+            @buffered = true
+          else
+            @buffered = false
           end
-
-          body.close if body.respond_to?(:close)
         end
 
-        @buffered = true
+        return @buffered
       end
 
       def append(chunk)
+        chunk = chunk.dup unless chunk.frozen?
         @body << chunk
 
         unless chunked?