Permalink
Browse files

Set session to an empty hash if :new_session => false and no session …

…cookie or param is present. CGI::Session was raising an unrescued ArgumentError.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5820 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jeremy committed Jan 1, 2007
1 parent 0a06ffc commit 0f048a5c9867b2e991ad540222c8d8188f5a24fc
Showing with 9 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +7 −1 actionpack/lib/action_controller/cgi_process.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError. [Josh Susser]
+
* Routing uses URI escaping for path components and CGI escaping for query parameters. [darix, Jeremy Kemper]
* Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting. Closes #6128. [Rick Olson]
@@ -110,7 +110,13 @@ def session
if session_options_with_string_keys['new_session'] == true
@session = new_session
else
- @session = CGI::Session.new(@cgi, session_options_with_string_keys)
+ 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
end
@session['__valid_session']
end

0 comments on commit 0f048a5

Please sign in to comment.