diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-26 15:34:09 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-26 15:34:09 -0800 |
| commit | fe4571259daab2738908da83b0c2c4387ba139e5 (patch) | |
| tree | f3e09b588ae9cba565649552e2ebccdc9f098514 /actionpack/lib | |
| parent | 5658923daa2f2c7858f55844168e1872cc611766 (diff) | |
| parent | 5d8faa683e230e6af54ac7616f98f3ae088e7682 (diff) | |
| download | rails-fe4571259daab2738908da83b0c2c4387ba139e5.tar.gz rails-fe4571259daab2738908da83b0c2c4387ba139e5.tar.bz2 rails-fe4571259daab2738908da83b0c2c4387ba139e5.zip | |
Merge pull request #8329 from elia/fix-send-data-disposition-with-symbols-master
Accept symbols as #send_data :disposition value
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 334943818c..75c4d3ef99 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -150,6 +150,7 @@ module ActionController #:nodoc: 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 end |