diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-15 07:02:32 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-15 07:02:32 -0700 |
commit | 3fb492ff8744a7745c89d70cddaa6ebbd268a13f (patch) | |
tree | 920614415163b5a5ba74338b2ad1ab793f9a2683 /actionpack/lib/action_dispatch | |
parent | 1b7894c95b1bdd2a3dca204629b66060f8a16bca (diff) | |
parent | b079f7a334137400085e19ec1b3ffc95fd53fc4c (diff) | |
download | rails-3fb492ff8744a7745c89d70cddaa6ebbd268a13f.tar.gz rails-3fb492ff8744a7745c89d70cddaa6ebbd268a13f.tar.bz2 rails-3fb492ff8744a7745c89d70cddaa6ebbd268a13f.zip |
Merge pull request #7655 from steveklabnik/master
fix the build
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/http/cache.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb index 13e2701663..d57666525d 100644 --- a/actionpack/lib/action_dispatch/http/cache.rb +++ b/actionpack/lib/action_dispatch/http/cache.rb @@ -28,6 +28,7 @@ module ActionDispatch end def etag_matches?(etag) + etag = etag.gsub(/^\"|\"$/, "") if_none_match_etags.include?(etag) end |