HTTP spec states when If-Not-Match fails we cannot respond with 304

TooTallNate · Sep 13, 2010 · adbd971 · adbd971
1 parent 9998b93
commit adbd971
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/lib/connect/middleware/staticProvider.js b/lib/connect/middleware/staticProvider.js
@@ -154,6 +154,15 @@ function modified(req, headers) {
         noneMatch = req.headers['if-none-match'],
         etag = headers['ETag'];
 
+    // Check If-None-Match
+    if (noneMatch && etag) {
+        var etags = etag.split(/ *, */);
+        for (var i = 0, len = etags.length; i < len; ++i) {
+            if (etags[i] == etag) return false;
+        }
+        return true;
+    }
+
     // Check If-Modified-Since
     if (modifiedSince && lastModified) {
         modifiedSince = new Date(modifiedSince);
@@ -163,14 +172,6 @@ function modified(req, headers) {
             if (lastModified <= modifiedSince) return false;
         }
     }
-
-    // Check If-None-Match
-    if (noneMatch && etag) {
-        var etags = etag.split(/ *, */);
-        for (var i = 0, len = etags.length; i < len; ++i) {
-            if (etags[i] == etag) return false;
-        }
-    }
 
     return true;
 }