Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Session configuration in config/environment.rb instead of app/control…

…lers/application.rb

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6198 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 5a1251dc2df7a3a1e4d6fec2e9085a464543ff50 1 parent 45dd256
@jeremy jeremy authored
View
3  actionpack/lib/action_controller/session_management.rb
@@ -81,6 +81,9 @@ def session(*args)
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
View
8 railties/environments/environment.rb
@@ -40,7 +40,11 @@
# 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 @@
# Mime::Type.register "text/richtext", :rtf
# Mime::Type.register "application/x-mobile", :mobile
-# Include your application configuration below
+# Include your application configuration below
View
5 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
Please sign in to comment.
Something went wrong with that request. Please try again.