diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-09-23 19:43:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-23 19:43:06 +0200 |
commit | ed56a031041a868eeeb439d8b79d04565be1286f (patch) | |
tree | ce6a75a8a34c92f2291a2188845ce2084e069b89 /actionpack/lib/action_controller/metal | |
parent | 22dc2b3db894cb709c132456d787166839455a8e (diff) | |
parent | 890485cfce4c361c03a41ec23b0ba187007818cc (diff) | |
download | rails-ed56a031041a868eeeb439d8b79d04565be1286f.tar.gz rails-ed56a031041a868eeeb439d8b79d04565be1286f.tar.bz2 rails-ed56a031041a868eeeb439d8b79d04565be1286f.zip |
Merge pull request #33829 from mtsmfm/encode-filename
Encode Content-Disposition filenames on send_data and send_file
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 5a82ccf668..5140a667de 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "action_controller/metal/exceptions" +require "action_dispatch/http/content_disposition" module ActionController #:nodoc: # Methods for sending arbitrary data and for streaming files to the browser, @@ -132,10 +133,8 @@ module ActionController #:nodoc: end disposition = options.fetch(:disposition, DEFAULT_SEND_FILE_DISPOSITION) - unless disposition.nil? - disposition = disposition.to_s - disposition += %(; filename="#{options[:filename]}") if options[:filename] - headers["Content-Disposition"] = disposition + if disposition + headers["Content-Disposition"] = ActionDispatch::Http::ContentDisposition.format(disposition: disposition, filename: options[:filename]) end headers["Content-Transfer-Encoding"] = "binary" |