aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-09-06 18:19:34 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-09-08 20:27:05 +0200
commit72889a6be4ec4afd68d3e4c3ae972099e080478a (patch)
tree5620dd24f77b1d2cbc2bcf01ae479669b2332e34 /actionpack
parent57c4a58d0236f2c8e54e0632e75f89846df4bc6f (diff)
downloadrails-72889a6be4ec4afd68d3e4c3ae972099e080478a.tar.gz
rails-72889a6be4ec4afd68d3e4c3ae972099e080478a.tar.bz2
rails-72889a6be4ec4afd68d3e4c3ae972099e080478a.zip
Push key_generator into SerializedCookieJars
It's only used there.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/cookies.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 0f316be681..b653e4eacd 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -226,10 +226,6 @@ module ActionDispatch
def upgrade_legacy_signed_cookies?
request.secret_token.present? && request.secret_key_base.present?
end
-
- def key_generator
- request.key_generator
- end
end
# Passing the ActiveSupport::MessageEncryptor::NullSerializer downstream
@@ -501,6 +497,10 @@ module ActionDispatch
def digest
request.cookies_digest || 'SHA1'
end
+
+ def key_generator
+ request.key_generator
+ end
end
class SignedCookieJar < AbstractCookieJar # :nodoc: