github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-28 15:58:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Include all of session creation in stale_session_check

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2958 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2005-11-09 20:34:44 +00:00
parent 773b869088
commit 3661eacfbd
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
actionpack/lib/action_controller/cgi_process.rb
View File

@@ -95,12 +95,14 @@ module ActionController #:nodoc:
if @session_options == false
@session = Hash.new
else
if session_options_with_string_keys['new_session'] == true
@session = new_session
else
@session = CGI::Session.new(@cgi, session_options_with_string_keys)
stale_session_check! do
if session_options_with_string_keys['new_session'] == true
@session = new_session
else
@session = CGI::Session.new(@cgi, session_options_with_string_keys)
end
@session['__valid_session']
end
stale_session_check!
end
end
@session
@@ -127,7 +129,7 @@ module ActionController #:nodoc:
end
def stale_session_check!
@session['__valid_session']
yield
rescue ArgumentError => argument_error
if argument_error.message =~ %r{undefined class/module (\w+)}
begin