From 11fd052aa815ae0255ea5b2463e88138fb3fec61 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 9 Jul 2014 21:49:37 -0300 Subject: Regenerate sid when sbdy tries to fixate the session Fixed broken test. Thanks Stephen Richards for reporting. --- actionpack/lib/action_dispatch/middleware/session/cache_store.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_dispatch/middleware/session/cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/cache_store.rb index 1db6194271..625050dc4b 100644 --- a/actionpack/lib/action_dispatch/middleware/session/cache_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/cache_store.rb @@ -16,9 +16,9 @@ module ActionDispatch # Get a session from the cache. def get_session(env, sid) - sid ||= generate_sid - session = @cache.read(cache_key(sid)) - session ||= {} + unless sid and session = @cache.read(cache_key(sid)) + sid, session = generate_sid, {} + end [sid, session] end -- cgit v1.2.3