diff options
| author | Sergey Nartimov <just.lest@gmail.com> | 2012-04-30 10:15:41 +0300 |
|---|---|---|
| committer | Sergey Nartimov <just.lest@gmail.com> | 2012-04-30 10:15:41 +0300 |
| commit | cbb264e9fac39358c938fa172eb0f83ebd56b47d (patch) | |
| tree | dba64094f5c74badf709419f759051d7279b0475 /actionpack/lib/action_controller/metal/data_streaming.rb | |
| parent | 9f64f20b8b635f21e47bf7e8432700ed29194f88 (diff) | |
| download | rails-cbb264e9fac39358c938fa172eb0f83ebd56b47d.tar.gz rails-cbb264e9fac39358c938fa172eb0f83ebd56b47d.tar.bz2 rails-cbb264e9fac39358c938fa172eb0f83ebd56b47d.zip | |
no need to dup options in send_data
options aren't modified inside send_file_headers!
Diffstat (limited to 'actionpack/lib/action_controller/metal/data_streaming.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 773f15f58d..374645c9ce 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -125,7 +125,7 @@ module ActionController #:nodoc: # # See +send_file+ for more information on HTTP Content-* headers and caching. def send_data(data, options = {}) #:doc: - send_file_headers! options.dup + send_file_headers! options render options.slice(:status, :content_type).merge(:text => data) end |