diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-13 13:28:14 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-13 13:28:28 -0800 |
| commit | 0932b012fae2ff21214f610a0fd78a55ae4e2420 (patch) | |
| tree | 82b521a5ddf17c3bc4fd7762c95d49f29d31de15 /railties | |
| parent | 6fe739ad752aeeaaf274ced6111685d2d6ed2eb8 (diff) | |
| parent | 5a43908c7414996354ca427354d98d789e0210e7 (diff) | |
| download | rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.tar.gz rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.tar.bz2 rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.zip | |
Sync 'rails/rails/master'
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/configs/initializers/session_store.rb | 2 | ||||
| -rw-r--r-- | railties/doc/guides/source/security.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/configs/initializers/session_store.rb b/railties/configs/initializers/session_store.rb index 40179e0aa3..4499ab84b6 100644 --- a/railties/configs/initializers/session_store.rb +++ b/railties/configs/initializers/session_store.rb @@ -5,7 +5,7 @@ # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. ActionController::Base.session = { - :session_key => '_<%= app_name %>_session', + :key => '_<%= app_name %>_session', :secret => '<%= app_secret %>' } diff --git a/railties/doc/guides/source/security.txt b/railties/doc/guides/source/security.txt index 9b3f47932e..b4e8bb4b41 100644 --- a/railties/doc/guides/source/security.txt +++ b/railties/doc/guides/source/security.txt @@ -93,7 +93,7 @@ That means the security of this storage depends on this secret (and of the diges .................................... config.action_controller.session = { - :session_key => ‘_app_session’, + :key => ‘_app_session’, :secret => ‘0x0dkfj3927dkc7djdh36rkckdfzsg...’ } .................................... |