diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-02-11 02:55:48 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-02-11 02:56:03 -0800 |
| commit | 7a3ef9842b3cbfe6dbe14700086824d163ce4d51 (patch) | |
| tree | 49d70d4fe0a4b6b9d0dcd334e57f3e157b4b6405 | |
| parent | 0b86a6e950ed78822470793deddbec41c6d105f5 (diff) | |
| download | rails-7a3ef9842b3cbfe6dbe14700086824d163ce4d51.tar.gz rails-7a3ef9842b3cbfe6dbe14700086824d163ce4d51.tar.bz2 rails-7a3ef9842b3cbfe6dbe14700086824d163ce4d51.zip | |
Migrate hash-based cookie values correctly
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 2af45d43bb..31341dba63 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -181,7 +181,7 @@ module ActionDispatch def verify_and_upgrade_legacy_signed_message(name, signed_message) @legacy_verifier.verify(signed_message).tap do |value| - self[name] = value + self[name] = { value: value } end rescue ActiveSupport::MessageVerifier::InvalidSignature nil @@ -412,7 +412,9 @@ module ActionDispatch def deserialize(name, value) if value if needs_migration?(value) - self[name] = Marshal.load(value) + Marshal.load(value).tap do |value| + self[name] = { value: value } + end else serializer.load(value) end |