From cddb700cc2d8d82ebc96162b48df85aed7106df1 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 6 Oct 2015 13:15:39 -0700 Subject: etag header is in Rack, so use it's response methods Rack implements the Etag header manipulation methods, so we can use those instead of ours. --- actionpack/lib/action_dispatch/http/cache.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb index 6b25ee9a70..f72a2607b6 100644 --- a/actionpack/lib/action_dispatch/http/cache.rb +++ b/actionpack/lib/action_dispatch/http/cache.rb @@ -82,19 +82,15 @@ module ActionDispatch def etag=(etag) key = ActiveSupport::Cache.expand_cache_key(etag) - set_header ETAG, %("#{Digest::MD5.hexdigest(key)}") + super %("#{Digest::MD5.hexdigest(key)}") end - def etag - get_header ETAG - end - alias :etag? :etag + def etag?; etag; end private DATE = 'Date'.freeze LAST_MODIFIED = "Last-Modified".freeze - ETAG = "ETag".freeze CACHE_CONTROL = "Cache-Control".freeze SPECIAL_KEYS = Set.new(%w[extras no-cache max-age public must-revalidate]) -- cgit v1.2.3