From fe7995f718098d3979e01af8957c910eb0d5b3e6 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 1 Jan 2007 01:30:28 +0000 Subject: Merge [5822] from 1.2 (oops, wrong order). git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5823 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/cgi_process.rb | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 1ee0d60e07..292877d93b 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -107,16 +107,21 @@ module ActionController #:nodoc: @session = Hash.new else stale_session_check! do - if session_options_with_string_keys['new_session'] == true - @session = new_session - else - begin + case value = session_options_with_string_keys['new_session'] + when true + @session = new_session + when false + begin + @session = CGI::Session.new(@cgi, session_options_with_string_keys) + # CGI::Session raises ArgumentError if 'new_session' == false + # and no session cookie or query param is present. + rescue ArgumentError + @session = Hash.new + end + when nil @session = CGI::Session.new(@cgi, session_options_with_string_keys) - # CGI::Session raises ArgumentError if 'new_session' == false - # and no session cookie or query param is present. - rescue ArgumentError - @session = Hash.new - end + else + raise ArgumentError, "Invalid new_session option: #{value}" end @session['__valid_session'] end -- cgit v1.2.3