Changeset 3767

Timestamp:

03/04/06 22:41:59 (3 years ago)

Author:

david

Message:

Backed out of that. PStore doesnt support suffix :(

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/cgi_process.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/actionpack/lib/action_controller/cgi_process.rb

@@ -37 +37 @@
-    DEFAULT_SESSION_OPTIONS = {
-      :database_manager => CGI::Session::PStore,
-suffix           => ".rails_session
+prefix           => "ruby_sess.
-      :session_path     => "/"
-    } unless const_defined?(:DEFAULT_SESSION_OPTIONS)
@@ -154 +154 @@
-      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