diff options
| author | Ryan Bigg <radarlistener@gmail.com> | 2008-12-21 13:30:51 +1030 |
|---|---|---|
| committer | Ryan Bigg <radarlistener@gmail.com> | 2008-12-21 13:30:51 +1030 |
| commit | 4fc9f69e54e649e2bc14a796ad7363426958a5ad (patch) | |
| tree | f6bb401cb70e449fc79b1754fd46fa4fa71ad5da /actionpack/lib/action_controller/rack_process.rb | |
| parent | 199f4c54ea3139168a867b7f80ac789a3c29a48d (diff) | |
| parent | 19939fd4c0d0e4eae4ec71df13228547dba03287 (diff) | |
| download | rails-4fc9f69e54e649e2bc14a796ad7363426958a5ad.tar.gz rails-4fc9f69e54e649e2bc14a796ad7363426958a5ad.tar.bz2 rails-4fc9f69e54e649e2bc14a796ad7363426958a5ad.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/rack_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rack_process.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/rack_process.rb b/actionpack/lib/action_controller/rack_process.rb index e783839f34..8483f8e289 100644 --- a/actionpack/lib/action_controller/rack_process.rb +++ b/actionpack/lib/action_controller/rack_process.rb @@ -83,11 +83,7 @@ module ActionController #:nodoc: @status || super end - def out(&block) - # Nasty hack because CGI sessions are closed after the normal - # prepare! statement - set_cookies! - + def to_a(&block) @block = block @status = headers.delete("Status") if [204, 304].include?(status.to_i) @@ -97,7 +93,6 @@ module ActionController #:nodoc: [status, headers.to_hash, self] end end - alias to_a out def each(&callback) if @body.respond_to?(:call) @@ -132,7 +127,7 @@ module ActionController #:nodoc: convert_language! convert_expires! set_status! - # set_cookies! + set_cookies! end private |