diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2010-09-05 22:06:43 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-09-06 13:40:45 +0200 |
commit | 11fccc5f06bc67353b895eeeb65cfab94cb4cd25 (patch) | |
tree | 22f9c1970bdb16f54a19c852dc9a0d48e9d7c692 /actionpack/lib/action_controller/metal/streaming.rb | |
parent | ed2650646ec9bd1103d6c049db8df99b7313d6b1 (diff) | |
download | rails-11fccc5f06bc67353b895eeeb65cfab94cb4cd25.tar.gz rails-11fccc5f06bc67353b895eeeb65cfab94cb4cd25.tar.bz2 rails-11fccc5f06bc67353b895eeeb65cfab94cb4cd25.zip |
Cleanup deprecation warnings in Action Controller
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller/metal/streaming.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index d75b46dace..2013da3adb 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -69,10 +69,6 @@ module ActionController #:nodoc: options[:filename] ||= File.basename(path) unless options[:url_based_filename] send_file_headers! options - if options[:x_sendfile] - ActiveSupport::Deprecation.warn(":x_sendfile is no longer needed in send_file", caller) - end - self.status = options[:status] || 200 self.content_type = options[:content_type] if options.key?(:content_type) self.response_body = File.open(path, "rb") @@ -121,10 +117,6 @@ module ActionController #:nodoc: raise ArgumentError, ":#{arg} option required" if options[arg].nil? end - if options.key?(:length) - ActiveSupport::Deprecation.warn("You do not need to provide the file's length", caller) - end - disposition = options[:disposition] disposition += %(; filename="#{options[:filename]}") if options[:filename] |