diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-06 23:16:13 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-06 23:16:13 +0200 |
| commit | db520042b3fbb94fd12f9f8c0458f6b2cd5187a9 (patch) | |
| tree | cb52db780575ee5c27eeed90721258d1fac55ada /actionpack/lib/action_controller | |
| parent | 2a04110f266b6ccaf94aeeae224af578a9620fbd (diff) | |
| parent | 3ca6988b782f7ae9da736b090fbf1edd8bc02fcb (diff) | |
| download | rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.tar.gz rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.tar.bz2 rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/streaming.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb index 2013da3adb..312dc8eb3e 100644 --- a/actionpack/lib/action_controller/metal/streaming.rb +++ b/actionpack/lib/action_controller/metal/streaming.rb @@ -101,10 +101,6 @@ module ActionController #:nodoc: # send_data image.data, :type => image.content_type, :disposition => 'inline' # # See +send_file+ for more information on HTTP Content-* headers and caching. - # - # <b>Tip:</b> if you want to stream large amounts of on-the-fly generated - # data to the browser, then use <tt>render :text => proc { ... }</tt> - # instead. See ActionController::Base#render for more information. def send_data(data, options = {}) #:doc: send_file_headers! options.dup render options.slice(:status, :content_type).merge(:text => data) |