diff options
| author | Colin Curtin <colin@procore.com> | 2008-12-20 20:21:20 -0800 |
|---|---|---|
| committer | Colin Curtin <colin@procore.com> | 2008-12-20 20:21:20 -0800 |
| commit | 0e121f9ed93ebb417cc63307aaaf47f8adfd220d (patch) | |
| tree | 39530f289b38a5dd1b2e6b170dab2631c983aaf3 /actionpack/lib/action_controller/rack_process.rb | |
| parent | b0187434bd7601a5b2e5f7afac99c964e566b9db (diff) | |
| parent | a0d091a41604d709cf2b99c85dcf4ae3ee275b9c (diff) | |
| download | rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.tar.gz rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.tar.bz2 rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.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 |