aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorElia Schito <elia@schito.me>2012-11-26 23:49:14 +0100
committerElia Schito <elia@schito.me>2012-11-27 00:21:12 +0100
commit5d8faa683e230e6af54ac7616f98f3ae088e7682 (patch)
treef3e09b588ae9cba565649552e2ebccdc9f098514 /actionpack/lib/action_controller
parent5658923daa2f2c7858f55844168e1872cc611766 (diff)
downloadrails-5d8faa683e230e6af54ac7616f98f3ae088e7682.tar.gz
rails-5d8faa683e230e6af54ac7616f98f3ae088e7682.tar.bz2
rails-5d8faa683e230e6af54ac7616f98f3ae088e7682.zip
Accept symbols as #send_data :disposition value
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/data_streaming.rb1
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