aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_process.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-07-22 10:37:09 +0000
committerJamis Buck <jamis@37signals.com>2005-07-22 10:37:09 +0000
commit06843f8794ad8c0368ece9ab57e340052f758025 (patch)
tree8c79aba7c8267733b4f66e20a6a57ff1c0b1110b /actionpack/lib/action_controller/cgi_process.rb
parent06160fd3e85e99374ac09bb941aa499eba7a98c5 (diff)
downloadrails-06843f8794ad8c0368ece9ab57e340052f758025.tar.gz
rails-06843f8794ad8c0368ece9ab57e340052f758025.tar.bz2
rails-06843f8794ad8c0368ece9ab57e340052f758025.zip
Added support for per-action session management #1763
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1886 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index a8ac127ac7..1b36274dd9 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -37,7 +37,7 @@ module ActionController #:nodoc:
end
class CgiRequest < AbstractRequest #:nodoc:
- attr_accessor :cgi
+ attr_accessor :cgi, :session_options
DEFAULT_SESSION_OPTIONS = {
:database_manager => CGI::Session::PStore,
@@ -115,7 +115,7 @@ module ActionController #:nodoc:
end
def reset_session
- @session.delete
+ @session.delete if CGI::Session === @session
@session = (@session_options == false ? {} : new_session)
end