diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-30 14:58:06 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-30 14:58:06 -0700 |
commit | f6068f1df7a4a35cdeca3fecdca096c692b1d43b (patch) | |
tree | 225fe84c94db1ae5759c4bd46dcd6f3518ae391b /actionpack/lib/action_controller/metal/live.rb | |
parent | 4ac81de52fbcdabc68f6d1fa8a5ee9ff7fff7df1 (diff) | |
parent | eae19033fbec07bdec3dd532fe29989fc137ba24 (diff) | |
download | rails-f6068f1df7a4a35cdeca3fecdca096c692b1d43b.tar.gz rails-f6068f1df7a4a35cdeca3fecdca096c692b1d43b.tar.bz2 rails-f6068f1df7a4a35cdeca3fecdca096c692b1d43b.zip |
Merge pull request #7203 from frodsan/typo_live
fix typo in metal/live [ci skip]
Diffstat (limited to 'actionpack/lib/action_controller/metal/live.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/live.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb index 4674f0348d..260a33f45a 100644 --- a/actionpack/lib/action_controller/metal/live.rb +++ b/actionpack/lib/action_controller/metal/live.rb @@ -3,7 +3,7 @@ require 'delegate' module ActionController # :nodoc: # Mix this module in to your controller, and all actions in that controller - # will be able to stream data to the client as it's written. For example: + # will be able to stream data to the client as it's written. # # class MyController < ActionController::Base # include ActionController::Live @@ -18,17 +18,17 @@ module ActionController # :nodoc: # end # end # - # There are a few caveats with this use. You *cannot* write headers after the + # There are a few caveats with this use. You *cannot* write headers after the # response has been committed (Response#committed? will return truthy). # Calling +write+ or +close+ on the response stream will cause the response - # object to be committed. Make sure all headers are set before calling write + # object to be committed. Make sure all headers are set before calling write # or close on your stream. # # You *must* call close on your stream when you're finished, otherwise the # socket may be left open forever. # - # The final caveat is that you actions are executed in a separate thread than - # the main thread. Make sure your actions are thread safe, and this shouldn't + # The final caveat is that your actions are executed in a separate thread than + # the main thread. Make sure your actions are thread safe, and this shouldn't # be a problem (don't share state across threads, etc). module Live class Buffer < ActionDispatch::Response::Buffer # :nodoc: @@ -100,7 +100,7 @@ module ActionController # :nodoc: t1 = Thread.current locals = t1.keys.map { |key| [key, t1[key]] } - # This processes the action in a child thread. It lets us return the + # This processes the action in a child thread. It lets us return the # response code and headers back up the rack stack, and still process # the body in parallel with sending data to the client Thread.new { |