diff options
| author | Mathias Biilmann Christensen <mbc@mbcbook-2.local> | 2010-03-18 01:15:52 +0100 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-17 18:04:32 -0700 |
| commit | c8dd6f224c9345b7e95cc0203b636e49412b71dc (patch) | |
| tree | f5a37c4270dc0a223f17d3c1c3ae13db56220eff /actionpack/lib/action_dispatch | |
| parent | 0e15f07b75d04ddc349a93ad7fdfcbc502ef535d (diff) | |
| download | rails-c8dd6f224c9345b7e95cc0203b636e49412b71dc.tar.gz rails-c8dd6f224c9345b7e95cc0203b636e49412b71dc.tar.bz2 rails-c8dd6f224c9345b7e95cc0203b636e49412b71dc.zip | |
Deleting and setting a cookie in the same request was broken
Made sure to remove a cookie from @deleted_cookies when set
[#4211 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 0dc03a1a7e..ab7130ab08 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -84,6 +84,7 @@ module ActionDispatch options[:path] ||= "/" @set_cookies[key] = options + @delete_cookies.delete(key) value end |