Skip to content

Commit

Permalink
Backed out of that. PStore doesnt support suffix :(
Browse files Browse the repository at this point in the history
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3767 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Mar 4, 2006
1 parent 56b75a7 commit a1d70a5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 0 additions & 2 deletions actionpack/CHANGELOG
@@ -1,7 +1,5 @@
*SVN*

* CHANGED DEFAILT: File-based sessions now have a suffix of ".rails_session" instead of a prefix called "ruby_sess." [DHH]

* Fixed Effect.Appear in effects.js to work with floats in Safari #3524, #3813, #3044 [Thomas Fuchs]

* Fixed that default image extension was not appended when using a full URL with AssetTagHelper#image_tag #4032, #3728 [rubyonrails@beautifulpixel.com]
Expand Down
4 changes: 3 additions & 1 deletion actionpack/lib/action_controller/cgi_process.rb
Expand Up @@ -36,7 +36,7 @@ class CgiRequest < AbstractRequest #:nodoc:

DEFAULT_SESSION_OPTIONS = {
:database_manager => CGI::Session::PStore,
:suffix => ".rails_session",
:prefix => "ruby_sess.",
:session_path => "/"
} unless const_defined?(:DEFAULT_SESSION_OPTIONS)

Expand Down Expand Up @@ -153,6 +153,8 @@ def stale_session_check!

def session_options_with_string_keys
@session_options_with_string_keys ||= DEFAULT_SESSION_OPTIONS.merge(@session_options).inject({}) { |options, (k,v)| options[k.to_s] = v; options }
RAILS_DEFAULT_LOGGER.info "sess: #{@session_options_with_string_keys.inspect}"
@session_options_with_string_keys
end
end

Expand Down

0 comments on commit a1d70a5

Please sign in to comment.