Fixed staticCache() Age header field

zzen · Oct 16, 2011 · 53a19a9 · 53a19a9
1 parent 4b2941e
commit 53a19a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/middleware/static.js b/lib/middleware/static.js
@@ -154,7 +154,7 @@ var send = exports.send = function(req, res, next, options){
     // conditional GET support
     if (utils.conditionalGET(req)) {
       if (!utils.modified(req, res)) {
-        req.emit('static', null);
+        req.emit('static');
         return utils.notModified(res);
       }
     }

diff --git a/lib/middleware/staticCache.js b/lib/middleware/staticCache.js
@@ -73,7 +73,7 @@ module.exports = function staticCache(options){
       if (!contentLength || contentLength > maxlen) return;
 
       // dont cache items we shouldn't be
-      if (cc['no-cache']
+      if ( cc['no-cache']
         || cc['no-store']
         || cc['private']
         || cc['must-revalidate']) return;
@@ -108,9 +108,8 @@ module.exports = function staticCache(options){
 
     // cache hit, doesnt support range requests
     if (hit && hit.complete && !ranges) {
-      // todo clean these messy headers
       header = utils.merge({}, hit[0]);
-      header.Age = age = (new Date - header.date) / 1000 | 0;
+      header.Age = age = (new Date - new Date(header.date)) / 1000 | 0;
       header.date = new Date().toUTCString();
 
       // parse cache-controls