diff options
| -rw-r--r-- | actionpack/lib/action_controller/session_management.rb | 3 | ||||
| -rw-r--r-- | railties/environments/environment.rb | 8 | ||||
| -rw-r--r-- | railties/helpers/application.rb | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/session_management.rb b/actionpack/lib/action_controller/session_management.rb index bf402c93e1..5b39118001 100644 --- a/actionpack/lib/action_controller/session_management.rb +++ b/actionpack/lib/action_controller/session_management.rb @@ -81,6 +81,9 @@ module ActionController #:nodoc: write_inheritable_array("session_options", [options]) end + # So we can declare session options in the Rails initializer. + alias_method :session=, :session + def cached_session_options #:nodoc: @session_options ||= read_inheritable_attribute("session_options") || [] end diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index fe12591ded..e7526ab5e3 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -40,7 +40,11 @@ Rails::Initializer.run do |config| # Make Active Record use UTC-base instead of local time # config.active_record.default_timezone = :utc - + + # Your secret key for verifying cookie session data integrity. + # If you change this key, all old sessions will become invalid! + config.action_controller.session = { :secret => '<%= CGI::Session.generate_unique_id(app_name) %>' } + # See Rails::Configuration for more options end @@ -57,4 +61,4 @@ end # Mime::Type.register "text/richtext", :rtf # Mime::Type.register "application/x-mobile", :mobile -# Include your application configuration below
\ No newline at end of file +# Include your application configuration below diff --git a/railties/helpers/application.rb b/railties/helpers/application.rb index c901717712..b61c6de386 100644 --- a/railties/helpers/application.rb +++ b/railties/helpers/application.rb @@ -2,9 +2,4 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base - # Pick a unique cookie name to distinguish our session from others. - # Session data is stored in a cookie by default, so the data is hashed - # with a secret to ensure its integrity. - session :session_key => '_<%= app_name %>_session', - :secret => '<%= CGI::Session.generate_unique_id(app_name) %>' end |