diff options
author | Joshua Peek <josh@joshpeek.com> | 2008-12-18 12:56:18 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-12-18 12:56:18 -0600 |
commit | 2e22c7fda00f78db79cb2dcc79495c085035240d (patch) | |
tree | 92c18edbcab2e2d0733b77604838fe7ee3e53cd5 /actionpack/lib/action_controller/session_management.rb | |
parent | 2eb2ec9e635c740684673495ed547d1c0769038d (diff) | |
download | rails-2e22c7fda00f78db79cb2dcc79495c085035240d.tar.gz rails-2e22c7fda00f78db79cb2dcc79495c085035240d.tar.bz2 rails-2e22c7fda00f78db79cb2dcc79495c085035240d.zip |
Conditionally inject session middleware instead of using session management
Diffstat (limited to 'actionpack/lib/action_controller/session_management.rb')
-rw-r--r-- | actionpack/lib/action_controller/session_management.rb | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/actionpack/lib/action_controller/session_management.rb b/actionpack/lib/action_controller/session_management.rb index a9989d8198..f06a0da75c 100644 --- a/actionpack/lib/action_controller/session_management.rb +++ b/actionpack/lib/action_controller/session_management.rb @@ -6,35 +6,6 @@ module ActionController #:nodoc: end end - class Middleware - DEFAULT_OPTIONS = { - :path => "/", - :key => "_session_id", - :httponly => true, - }.freeze - - def self.new(app) - cgi_options = ActionController::Base.session_options - options = cgi_options.symbolize_keys - options = DEFAULT_OPTIONS.merge(options) - if options.has_key?(:session_path) - options[:path] = options.delete(:session_path) - end - if options.has_key?(:session_key) - options[:key] = options.delete(:session_key) - end - if options.has_key?(:session_http_only) - options[:httponly] = options.delete(:session_http_only) - end - - if store = ActionController::Base.session_store - store.new(app, options) - else # Sessions disabled - lambda { |env| app.call(env) } - end - end - end - module ClassMethods # Set the session store to be used for keeping the session data between requests. # By default, sessions are stored in browser cookies (<tt>:cookie_store</tt>), |