From b96464e7eeb90983227ae63accd627878f2919b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sat, 15 Sep 2012 11:37:50 -0300 Subject: Check if etag exists before to do the gsub This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981 --- actionpack/lib/action_dispatch/http/cache.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb index d57666525d..0d6015d993 100644 --- a/actionpack/lib/action_dispatch/http/cache.rb +++ b/actionpack/lib/action_dispatch/http/cache.rb @@ -28,8 +28,10 @@ module ActionDispatch end def etag_matches?(etag) - etag = etag.gsub(/^\"|\"$/, "") - if_none_match_etags.include?(etag) + if etag + etag = etag.gsub(/^\"|\"$/, "") + if_none_match_etags.include?(etag) + end end # Check response freshness (Last-Modified and ETag) against request -- cgit v1.2.3