From caa378d66c0b31ded87e5977d52b7c74acc24787 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 20 Nov 2011 16:45:51 -0600
Subject: [PATCH] Remove server mtime checking

---
 lib/sprockets/server.rb | 11 ++---------
 test/test_server.rb     | 17 -----------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/lib/sprockets/server.rb b/lib/sprockets/server.rb
index d355db95e..7aeb80894 100644
--- a/lib/sprockets/server.rb
+++ b/lib/sprockets/server.rb
@@ -53,9 +53,8 @@ def call(env)
         # Return a 404 Not Found
         not_found_response
 
-      # Check request headers `HTTP_IF_MODIFIED_SINCE` and
-      # `HTTP_IF_NONE_MATCH` against the assets mtime and digest
-      elsif not_modified?(asset, env) || etag_match?(asset, env)
+      # Check request headers `HTTP_IF_NONE_MATCH` against the asset digest
+      elsif etag_match?(asset, env)
         logger.info "#{msg} 304 Not Modified (#{time_elapsed.call}ms)"
 
         # Return a 304 Not Modified
@@ -174,12 +173,6 @@ def escape_css_content(content)
           gsub('/',  '\\\\002f ')
       end
 
-      # Compare the requests `HTTP_IF_MODIFIED_SINCE` against the
-      # assets mtime
-      def not_modified?(asset, env)
-        env["HTTP_IF_MODIFIED_SINCE"] == asset.mtime.httpdate
-      end
-
       # Compare the requests `HTTP_IF_NONE_MATCH` against the assets digest
       def etag_match?(asset, env)
         env["HTTP_IF_NONE_MATCH"] == etag(asset)
diff --git a/test/test_server.rb b/test/test_server.rb
index 372253238..fb8954588 100644
--- a/test/test_server.rb
+++ b/test/test_server.rb
@@ -124,23 +124,6 @@ def app
     assert_equal time_before_touching, time_after_touching
   end
 
-  test "not modified response when headers match" do
-    get "/assets/application.js"
-    assert_equal 200, last_response.status
-
-    path = fixture_path "server/app/javascripts/bar.js"
-    mtime = Time.now + 1
-    File.utime(mtime, mtime, path)
-
-    get "/assets/bar.js", {},
-      'HTTP_IF_MODIFIED_SINCE' =>
-        File.mtime(fixture_path("server/app/javascripts/bar.js")).httpdate
-
-    assert_equal 304, last_response.status
-    assert_equal nil, last_response.headers['Content-Type']
-    assert_equal nil, last_response.headers['Content-Length']
-  end
-
   test "not modified partial response when etags match" do
     get "/assets/application.js?body=1"
     assert_equal 200, last_response.status