aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-04 22:41:59 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-04 22:41:59 +0000
commita1d70a53294a9b5389926323714f03ceeb58393e (patch)
tree00dcf4915edfcd1a754a80917d79d5aadd14b387 /actionpack
parent56b75a7e04dcd8ed05e2aae4e51441ef38af395b (diff)
downloadrails-a1d70a53294a9b5389926323714f03ceeb58393e.tar.gz
rails-a1d70a53294a9b5389926323714f03ceeb58393e.tar.bz2
rails-a1d70a53294a9b5389926323714f03ceeb58393e.zip
Backed out of that. PStore doesnt support suffix :(
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3767 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 7d4978f751..49fd59c72e 100644
--- a/actionpack/CHANGELOG
+++ b/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]
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index f30481ee8a..607c1381bd 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -36,7 +36,7 @@ module ActionController #:nodoc:
DEFAULT_SESSION_OPTIONS = {
:database_manager => CGI::Session::PStore,
- :suffix => ".rails_session",
+ :prefix => "ruby_sess.",
:session_path => "/"
} unless const_defined?(:DEFAULT_SESSION_OPTIONS)
@@ -153,6 +153,8 @@ end_msg
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