aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-04-30 06:28:22 -0700
committerJosé Valim <jose.valim@gmail.com>2012-04-30 06:28:22 -0700
commitbca9a9e926db11c5c9a438493d49317146c64fb6 (patch)
treebd2673e72528d07c93ea128991083b0faab1a713 /actionpack/lib/action_dispatch
parent09de707f258829030e643fad872a882eaa8ed190 (diff)
parent41219386268f670399a905c11e28b1ef76939ee1 (diff)
downloadrails-bca9a9e926db11c5c9a438493d49317146c64fb6.tar.gz
rails-bca9a9e926db11c5c9a438493d49317146c64fb6.tar.bz2
rails-bca9a9e926db11c5c9a438493d49317146c64fb6.zip
Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores
Support cookie jar options for all cookie stores
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/abstract_store.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 6a8e690d18..45a00b5056 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -74,6 +74,13 @@ module ActionDispatch
class AbstractStore < Rack::Session::Abstract::ID
include Compatibility
include StaleSessionCheck
+
+ private
+
+ def set_cookie(env, session_id, cookie)
+ request = ActionDispatch::Request.new(env)
+ request.cookie_jar[key] = cookie
+ end
end
end
end