Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge [5822] from 1.2 (oops, wrong order).

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5823 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit fe7995f718098d3979e01af8957c910eb0d5b3e6 1 parent 0f048a5
Jeremy Kemper jeremy authored
Showing with 14 additions and 9 deletions.
  1. +14 −9 actionpack/lib/action_controller/cgi_process.rb
23 actionpack/lib/action_controller/cgi_process.rb
View
@@ -107,16 +107,21 @@ def session
@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
Please sign in to comment.
Something went wrong with that request. Please try again.