X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/07e84496255ebd1d53108894e0fb8ce98b55ccee..fbf23107219bc0c0a24e9ce403bdeecb40690346:/config/initializers/streaming.rb diff --git a/config/initializers/streaming.rb b/config/initializers/streaming.rb index 116ca51dd..0fc092951 100644 --- a/config/initializers/streaming.rb +++ b/config/initializers/streaming.rb @@ -1,28 +1,16 @@ -# Hack ActionController::Streaming to allow streaming from a file handle +# Hack ActionController::DataStreaming to allow streaming from a file handle module ActionController - module Streaming + module DataStreaming alias_method :old_send_file, :send_file def send_file(file, options = {}) if file.is_a? File or file.is_a? Tempfile - options[:length] ||= file.stat.size options[:filename] ||= File.basename(file.path) unless options[:url_based_filename] send_file_headers! options - @performed_render = false - - if options[:stream] - render :status => options[:status], :text => Proc.new { |response, output| - logger.info "Streaming file #{file.path}" unless logger.nil? - len = options[:buffer_size] || 4096 - while buf = file.read(len) - output.write(buf) - end - } - else - logger.info "Sending file #{file.path}" unless logger.nil? - render :status => options[:status], :text => file.read - end + self.status = options[:status] || 200 + self.content_type = options[:content_type] if options.key?(:content_type) + self.response_body = file else old_send_file(file, options) end