diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-24 11:20:43 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-24 11:20:43 -0300 |
| commit | 907bcce9a005002739d6c71a5123b65c2f0ed183 (patch) | |
| tree | 9b784cb89e41337203c42e26eaca8840dafbb799 /actionpack | |
| parent | eb0d8ee4fd3e369e88fd77492d01b499d9550162 (diff) | |
| download | rails-907bcce9a005002739d6c71a5123b65c2f0ed183.tar.gz rails-907bcce9a005002739d6c71a5123b65c2f0ed183.tar.bz2 rails-907bcce9a005002739d6c71a5123b65c2f0ed183.zip | |
Return the same session data object when setting session id
Make sure to return the same hash object instead of returning a new one.
Returning a new one causes failures on cookie store tests, where it
tests for the 'Set-Cookie' header with the session signature.
This is due to the hash ordering changes on Ruby 1.8.7-p358.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/cookie_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb index 8ebf870b95..29e9e6c261 100644 --- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb @@ -59,7 +59,7 @@ module ActionDispatch end def set_session(env, sid, session_data, options) - session_data.merge("session_id" => sid) + session_data.merge!("session_id" => sid) end def set_cookie(env, session_id, cookie) |