aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorbrainopia <brainopia@evilmartians.com>2012-08-10 09:59:37 +0400
committerbrainopia <brainopia@evilmartians.com>2012-08-10 09:59:37 +0400
commit058dc9a09680e9e2a5777c441b966a6f5e12cf82 (patch)
treef86eb3797ef1bdd9bba5e2e373d8012a80074101 /actionpack/lib/action_dispatch
parentae2383d90a9646e36c8b5d92801fba284ea62ec0 (diff)
downloadrails-058dc9a09680e9e2a5777c441b966a6f5e12cf82.tar.gz
rails-058dc9a09680e9e2a5777c441b966a6f5e12cf82.tar.bz2
rails-058dc9a09680e9e2a5777c441b966a6f5e12cf82.zip
Revert "Revert "Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores""
This reverts commit a48ea6800ef712440b08c551f8041feb35de8cb4.
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 f75b4d4d04..c04fee21dc 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