Permalink
Browse files

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.
  • Loading branch information...
1 parent dafded2 commit a16aa8c3d20c47fdf023f76d8b3219d7215e3a70 @carlosantoniodasilva carlosantoniodasilva committed Mar 24, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -59,7 +59,7 @@ def unpacked_cookie_data(env)
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)

0 comments on commit a16aa8c

Please sign in to comment.