merged conditional header fields from master

senchalabs · Aug 15, 2011 · 06cbd48 · 06cbd48
1 parent 5f600e9
commit 06cbd48
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/middleware/static.js b/lib/middleware/static.js
@@ -182,9 +182,9 @@ var send = exports.send = function(req, res, next, options){
     // stream the entire file
     } else {
       res.setHeader('Content-Length', stat.size);
-      res.setHeader('Cache-Control', 'public, max-age=' + (maxAge / 1000));
+      if (!res.getHeader('Cache-Control')) res.setHeader('Cache-Control', 'public, max-age=' + (maxAge / 1000));
-      res.setHeader('Last-Modified', stat.mtime.toUTCString());
+      if (!res.getHeader('Last-Modified')) res.setHeader('Last-Modified', stat.mtime.toUTCString());
-      res.setHeader('ETag', utils.etag(stat));
+      if (!res.getHeader('ETag')) res.setHeader('ETag', utils.etag(stat));
 
       // conditional GET support
       if (utils.conditionalGET(req)) {