diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-29 15:23:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 15:23:04 -0700 |
| commit | 6949f8e5e7dc901d4e04ebab6c975afb33ca44c9 (patch) | |
| tree | aacd1d261e7e5d884d81a84c1c814c8a903ad287 /actionpack/lib/action_controller | |
| parent | 3fc414a019526e5584867b032a188adf15c71eac (diff) | |
| parent | 92f8b99ff74cee43f56ff336838b3a776e763136 (diff) | |
| download | rails-6949f8e5e7dc901d4e04ebab6c975afb33ca44c9.tar.gz rails-6949f8e5e7dc901d4e04ebab6c975afb33ca44c9.tar.bz2 rails-6949f8e5e7dc901d4e04ebab6c975afb33ca44c9.zip | |
Merge pull request #26317 from maclover7/jm-fix-26298
Allow `send_file` to declare a charset
Diffstat (limited to 'actionpack/lib/action_controller')
| -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 b598dd4d77..6a1acb64f7 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -70,6 +70,7 @@ module ActionController #:nodoc: send_file_headers! options self.status = options[:status] || 200 + self.content_type = options[:type] if options.key?(:type) self.content_type = options[:content_type] if options.key?(:content_type) response.send_file path end |