Merge branch 'master' of github.com:travis-ci/travis-web

2015-02-19 12:12:11 +01:00 · 2015-02-19 12:12:11 +01:00 · 583922d11f
commit 583922d11f
parent 01f00f08aa 1774e6d571
1 changed files with 4 additions and 3 deletions
--- a/waiter/lib/travis/web/app.rb
+++ b/waiter/lib/travis/web/app.rb
@ -138,9 +138,10 @@ class Travis::Web::App
    end

    def expires(file)
-      case path_for(file)
-      when '/' then '0'
-      else (server_start + age).httpdate
+      if fingerprinted?(file)
+        (server_start + age).httpdate 
+      else
+        '0'
      end
    end