github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

r3209@asus: jeremy | 2005-11-20 01:04:22 -0800

Browse Source 
If sessions are disabled, return a hash that raises an error when it's accessed.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3109 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2005-11-20 09:06:43 +00:00
parent 63b792162b
commit da9f713d2c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ module ActionController #:nodoc:
def session
unless @session
if @session_options == false
@session = Hash.new
@session = disabled_session_hash
else
stale_session_check! do
if session_options_with_string_keys['new_session'] == true
@@ -121,13 +121,17 @@ module ActionController #:nodoc:
# Delete an old session if it exists then create a new one.
def new_session
if @session_options == false
Hash.new
disabled_session_hash
else
CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => false)).delete rescue nil
CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
end
end
def disabled_session_hash
Hash.new { |h,k| raise "You disabled sessions but are attempting to set session[#{k.inspect}]" }
end
def stale_session_check!
yield
rescue ArgumentError => argument_error