aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-10-06 13:15:39 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-10-06 13:39:03 -0700
commitcddb700cc2d8d82ebc96162b48df85aed7106df1 (patch)
treecf53693422fe6bd392a9e93306dd7377944b7c84 /actionpack
parent71317e6406dba9a552760ec035b67b3c16162528 (diff)
downloadrails-cddb700cc2d8d82ebc96162b48df85aed7106df1.tar.gz
rails-cddb700cc2d8d82ebc96162b48df85aed7106df1.tar.bz2
rails-cddb700cc2d8d82ebc96162b48df85aed7106df1.zip
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.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/http/cache.rb8
1 files changed, 2 insertions, 6 deletions
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])