2 files changed, 21 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index 6f520b1054..369741fb12 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -74,7 +74,27 @@ module ActionController #:nodoc:
 
         self.status = options[:status] || 200
         self.content_type = options[:content_type] if options.key?(:content_type)
-        self.response_body = File.open(path, "rb")
+        self.response_body = FileBody.new(path)
+      end
+
+      # Avoid having to pass an open file handle as the response body.
+      # Rack::Sendfile will usually intercepts the response and just uses
+      # the path directly, so no reason to open the file.
+      class FileBody #:nodoc:
+        attr_reader :to_path
+
+        def initialize(path)
+          @to_path = path
+        end
+
+        # Stream the file's contents if Rack::Sendfile isn't present.
+        def each
+          File.open(to_path, 'rb') do |file|
+            while chunk = file.read(16384)
+              yield chunk
+            end
+          end
+        end
       end
 
       # Sends the given binary data to the browser. This method is similar to
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 9bd2e622ad..55a9819316 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -140,9 +140,6 @@ module ActionController
 
     class Result < ::Array #:nodoc:
       def to_s() join '/' end
-      def self.new_escaped(strings)
-        new strings.collect {|str| uri_parser.unescape str}
-      end
     end
 
     def assign_parameters(routes, controller_path, action, parameters = {})