1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rack_process.rb b/actionpack/lib/action_controller/rack_process.rb
index 221613b854..69bfc549c1 100644
--- a/actionpack/lib/action_controller/rack_process.rb
+++ b/actionpack/lib/action_controller/rack_process.rb
@@ -156,6 +156,10 @@ end_msg
     end
 
     def out(output = $stdout, &block)
+      # Nasty hack because CGI sessions are closed after the normal
+      # prepare! statement
+      set_cookies!
+
       @block = block
       @status = headers.delete("Status")
       if [204, 304].include?(status.to_i)
@@ -200,7 +204,7 @@ end_msg
       convert_language!
       convert_expires!
       set_status!
-      set_cookies!
+      # set_cookies!
     end
 
     private