Fixed regression with Base#reset_session that wouldn't use the the...

Fixed regression with Base#reset_session that wouldn't use the the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

 *SVN*
 
+* Fixed regression with Base#reset_session that wouldn't use the the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net]
+
 * Fixed error rendering of rxml documents to not just swallow the exception and return 0 (still not guessing the right line, but hey)
 
 * Fixed that textilize and markdown would instantiate their engines even on empty strings. This also fixes #333 [Ulysses]

actionpack/lib/action_controller/cgi_process.rb

@@ -92,7 +92,7 @@ def method_missing(method_id, *arguments)
 
     private
       def new_session
-        CGI::Session.new(@cgi, DEFAULT_SESSION_OPTIONS.merge(@session_options).merge("new_session" => true))
+        CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
       end
       
       def session_options_with_string_keys