From cd461c3e64e09cdcb1e379d1c35423c5e2caa592 Mon Sep 17 00:00:00 2001 From: Travis Warlick Date: Sat, 13 Aug 2011 21:23:27 -0500 Subject: Support for multiple etags in an If-None-Match header This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb --- actionpack/lib/action_dispatch/http/cache.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch/http/cache.rb') diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb index a7f93b780e..13e2701663 100644 --- a/actionpack/lib/action_dispatch/http/cache.rb +++ b/actionpack/lib/action_dispatch/http/cache.rb @@ -17,12 +17,18 @@ module ActionDispatch env[HTTP_IF_NONE_MATCH] end + def if_none_match_etags + (if_none_match ? if_none_match.split(/\s*,\s*/) : []).collect do |etag| + etag.gsub(/^\"|\"$/, "") + end + end + def not_modified?(modified_at) if_modified_since && modified_at && if_modified_since >= modified_at end def etag_matches?(etag) - if_none_match && if_none_match == etag + if_none_match_etags.include?(etag) end # Check response freshness (Last-Modified and ETag) against request -- cgit v1.2.3