diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-28 05:27:34 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-28 05:27:34 -0700 |
| commit | 7256cb53e0c34e510a4d59a50d120c0358cf1d99 (patch) | |
| tree | b437f7f6cc153bf878f26b36a7be6bd78da5996a /actionpack/lib/action_dispatch | |
| parent | 6ebe22c3ae716d089af1e5090ddb0d12b31af8ac (diff) | |
| parent | 1f5f5cfc363c82f38f0e1b171d1f798c6d5b4402 (diff) | |
| download | rails-7256cb53e0c34e510a4d59a50d120c0358cf1d99.tar.gz rails-7256cb53e0c34e510a4d59a50d120c0358cf1d99.tar.bz2 rails-7256cb53e0c34e510a4d59a50d120c0358cf1d99.zip | |
Merge pull request #7452 from arunagw/memcached_dalli
Memcached to dalli for actionpack test.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -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 38a737cd2b..14af7eef68 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/memcache' +require 'rack/session/dalli' module ActionDispatch module Session - class MemCacheStore < Rack::Session::Memcache + class MemCacheStore < Rack::Session::Dalli include Compatibility include StaleSessionCheck include SessionObject def initialize(app, options = {}) - require 'memcache' + require 'dalli' options[:expire_after] ||= options[:expires] super end |