From 977317da55b6ba9bbb1326392516480902145c5b Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 19 Aug 2008 16:29:02 -0500
Subject: hack around CGI session close

---
 actionpack/lib/action_controller/rack_process.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller')

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
-- 
cgit v1.2.3