diff options
| author | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
| commit | 197904341f2b2f21d69c653cede3aec124e86720 (patch) | |
| tree | 83f1234e238016126860a929594db22e1862d783 /actionpack/lib/action_dispatch/middleware | |
| parent | 76d2c455c0607b4cd5f238cadef8f933a18567fb (diff) | |
| parent | b3a0aed028835ce4551c4a76742744a40a71b0be (diff) | |
| download | rails-197904341f2b2f21d69c653cede3aec124e86720.tar.gz rails-197904341f2b2f21d69c653cede3aec124e86720.tar.bz2 rails-197904341f2b2f21d69c653cede3aec124e86720.zip | |
Merge branch 'master' into docrails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
| -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 |