diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
| commit | d9aae2b56e64a4f417eaffa99e10cca274e928e7 (patch) | |
| tree | 8438f6f784df9b252c0f834bc7cb9c369103d4cd /actionpack/lib/action_controller/base/http_authentication.rb | |
| parent | 5025ae610f89989f3e15241ec7065e3d443614d9 (diff) | |
| parent | 9533e0eca76b1df68a90e1ebe395d7b6a59d8e91 (diff) | |
| download | rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.gz rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.bz2 rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/base/http_authentication.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/http_authentication.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/http_authentication.rb b/actionpack/lib/action_controller/base/http_authentication.rb index 2519f55269..525787bf92 100644 --- a/actionpack/lib/action_controller/base/http_authentication.rb +++ b/actionpack/lib/action_controller/base/http_authentication.rb @@ -276,7 +276,7 @@ module ActionController # # The nonce is opaque to the client. Composed of Time, and hash of Time with secret # key from the Rails session secret generated upon creation of project. Ensures - # the time cannot be modifed by client. + # the time cannot be modified by client. def nonce(time = Time.now) t = time.to_i hashed = [t, secret_key] |