diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-08-31 15:41:03 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-08-31 15:54:31 +0100 |
| commit | ae79c7a201f3aeea8919790eca1faa3fb552f88a (patch) | |
| tree | 7bd38fb500aff7c8136f3433398ea80e5e085a02 /actionpack/lib | |
| parent | cd150c96e3dd7cc356c5e7b4901b9f520efa267c (diff) | |
| download | rails-ae79c7a201f3aeea8919790eca1faa3fb552f88a.tar.gz rails-ae79c7a201f3aeea8919790eca1faa3fb552f88a.tar.bz2 rails-ae79c7a201f3aeea8919790eca1faa3fb552f88a.zip | |
Revert "Merge pull request #7452 from arunagw/memcached_dalli"
This reverts commit 7256cb53e0c34e510a4d59a50d120c0358cf1d99, reversing
changes made to 6ebe22c3ae716d089af1e5090ddb0d12b31af8ac.
Reason: A test was failing.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb index 14af7eef68..38a737cd2b 100644 --- a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb @@ -1,15 +1,15 @@ require 'action_dispatch/middleware/session/abstract_store' -require 'rack/session/dalli' +require 'rack/session/memcache' module ActionDispatch module Session - class MemCacheStore < Rack::Session::Dalli + class MemCacheStore < Rack::Session::Memcache include Compatibility include StaleSessionCheck include SessionObject def initialize(app, options = {}) - require 'dalli' + require 'memcache' options[:expire_after] ||= options[:expires] super end |