Merge branch 'pull/4985'

[rails.git] / config / initializers / session_store.rb

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index aa90714049818f297915f7a1853aa4335b81626f..4119064c39cf1601dbcf5babc877ff06ae953ae1 100644 (file)
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,9 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Be sure to restart your server when you modify this file.
 

-if defined?(MEMCACHE_SERVERS)
-  cache = MemCache.new(:namespace => "rails:session", :string_return_types => true)
-
-  OpenStreetMap::Application.config.session_store :mem_cache_store, :cache => cache, :key => "_osm_session"
+if Settings.key?(:memcache_servers)
+  Rails.application.config.session_store :mem_cache_store, :memcache_server => Settings.memcache_servers, :namespace => "rails:session", :key => "_osm_session", :same_site => :lax

 else
 else

-  OpenStreetMap::Application.config.session_store :cache_store, :key => '_osm_session'
+  Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new, :same_site => :lax

 end
 end