aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-10-03 21:48:32 +0200
committerJosé Valim <jose.valim@gmail.com>2010-10-03 21:48:32 +0200
commit5f292c944155851df7e493f153cfb9d64c964388 (patch)
tree6adf5e0ff2c9fd6a198cd7faf30d294700a57096 /activerecord
parent5836af8f8b0eb3c569c66792abf50a0485bb6f22 (diff)
parent653acac069e66f53b791caa4838a1e25de905f31 (diff)
downloadrails-5f292c944155851df7e493f153cfb9d64c964388.tar.gz
rails-5f292c944155851df7e493f153cfb9d64c964388.tar.bz2
rails-5f292c944155851df7e493f153cfb9d64c964388.zip
Merge branch 'racksession'
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/session_store.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 01cc14b8d6..3fc596e02a 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -288,6 +288,7 @@ module ActiveRecord
self.session_class = Session
SESSION_RECORD_KEY = 'rack.session.record'
+ ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
private
def get_session(env, sid)
@@ -299,7 +300,7 @@ module ActiveRecord
end
end
- def set_session(env, sid, session_data)
+ def set_session(env, sid, session_data, options)
Base.silence do
record = get_session_model(env, sid)
record.data = session_data
@@ -316,12 +317,14 @@ module ActiveRecord
sid
end
- def destroy(env)
+ def destroy_session(env, session_id, options)
if sid = current_session_id(env)
Base.silence do
get_session_model(env, sid).destroy
end
end
+
+ generate_sid unless options[:drop]
end
def get_session_model(env, sid)