Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…FAULT_SESSION_OPTIONS [adam@the-kramers.net]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 1eb751a021c9b3d3fd74165583252e4a53322b58 1 parent 506fd8e
David Heinemeier Hansson dhh authored
2  actionpack/CHANGELOG
View
@@ -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]
2  actionpack/lib/action_controller/cgi_process.rb
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.