diff options
| author | Travis Warlick <warlickt@operissystems.com> | 2011-08-13 21:23:27 -0500 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2012-09-15 15:01:59 +0400 |
| commit | cd461c3e64e09cdcb1e379d1c35423c5e2caa592 (patch) | |
| tree | 98beac2682833974906c0f2cf8319fbe8e18747c /actionpack/lib/action_dispatch/http/cache.rb | |
| parent | 60c88e64e26682a954f7c8cd6669d409ffffcc8b (diff) | |
| download | rails-cd461c3e64e09cdcb1e379d1c35423c5e2caa592.tar.gz rails-cd461c3e64e09cdcb1e379d1c35423c5e2caa592.tar.bz2 rails-cd461c3e64e09cdcb1e379d1c35423c5e2caa592.zip | |
Support for multiple etags in an If-None-Match header
This is a rebased version of #2520.
Conflicts:
actionpack/test/dispatch/request_test.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/http/cache.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/cache.rb | 8 |
1 files changed, 7 insertions, 1 deletions
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 |