Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove set_cookie hack from rack response since we dont use cgi sessi…

…ons anymore
  • Loading branch information...
commit 1bcfce0130d4fa13d56f58d5cd5e0f5de33e015f 1 parent 246b582
@josh josh authored
View
2  actionpack/lib/action_controller/cookies.rb
@@ -67,6 +67,8 @@ def [](name)
cookie = @cookies[name.to_s]
if cookie && cookie.respond_to?(:value)
cookie.size > 1 ? cookie.value : cookie.value[0]
+ else
+ cookie
end
end
View
6 actionpack/lib/action_controller/rack_process.rb
@@ -84,10 +84,6 @@ def status
end
def out(&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)
@@ -132,7 +128,7 @@ def prepare!
convert_language!
convert_expires!
set_status!
- # set_cookies!
+ set_cookies!
end
private
Please sign in to comment.
Something went wrong with that request. Please try again.