diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 38010a7434..ae817a45d3 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *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] diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 64bfc1ed07..9ba4665270 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -92,7 +92,7 @@ module ActionController #:nodoc: 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 |