diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-12 09:52:41 -0700 |
---|---|---|
committer | Erich Menge <erich.menge@me.com> | 2012-08-15 08:43:49 -0500 |
commit | bccc35b13e4782bde4a8def9b52c21f1eda0b4b1 (patch) | |
tree | 7edcb85799b6a651d04979480e67997d1a12f2bd /actionpack/lib/action_controller/metal | |
parent | 786713a3abc375fab4d5c2f6f62a878c2ab51022 (diff) | |
download | rails-bccc35b13e4782bde4a8def9b52c21f1eda0b4b1.tar.gz rails-bccc35b13e4782bde4a8def9b52c21f1eda0b4b1.tar.bz2 rails-bccc35b13e4782bde4a8def9b52c21f1eda0b4b1.zip |
Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 0670a58d97..62e16ea047 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -75,7 +75,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 intercept the response and uses + # the path directly, so there is 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 @@ -115,7 +135,7 @@ module ActionController #:nodoc: private def send_file_headers!(options) type_provided = options.has_key?(:type) - + options.update(DEFAULT_SEND_FILE_OPTIONS.merge(options)) [:type, :disposition].each do |arg| raise ArgumentError, ":#{arg} option required" if options[arg].nil? |