Pass options from res.sendfile to send

fixes expressjs#2017

Author: dougwilson

History.md

@@ -1,6 +1,7 @@
 3.x
 ===
 
+  * Pass options from `res.sendfile` to `send`
   * deps: [email protected]
     - deps: body-parser@~1.5.0
     - deps: compression@~1.0.9

lib/response.js

@@ -308,8 +308,11 @@ res.jsonp = function(obj){
  *
  * Options:
  *
- *   - `maxAge` defaulting to 0
- *   - `root`   root directory for relative filenames
+ *   - `maxAge`   defaulting to 0
+ *   - `root`     root directory for relative filenames
+ *   - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them
+ *
+ * Other options are passed along to `send`.
  *
  * Examples:
  *
@@ -385,10 +388,7 @@ res.sendfile = function(path, options, fn){
   }
 
   // transfer
-  var file = send(req, path, {
-    maxAge: options.maxAge || 0,
-    root: options.root
-  });
+  var file = send(req, path, options);
   file.on('error', error);
   file.on('directory', next);
   file.on('stream', stream);

test/fixtures/.name

@@ -0,0 +1 @@
+tobi

test/res.sendfile.js

@@ -106,6 +106,30 @@ describe('res', function(){
   })
 
   describe('.sendfile(path)', function(){
+    it('should not serve dotfiles', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        res.sendfile('test/fixtures/.name');
+      });
+
+      request(app)
+      .get('/')
+      .expect(404, done);
+    })
+
+    it('should accept dotfiles option', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        res.sendfile('test/fixtures/.name', { dotfiles: 'allow' });
+      });
+
+      request(app)
+      .get('/')
+      .expect(200, 'tobi', done);
+    })
+
     describe('with an absolute path', function(){
       it('should transfer the file', function(done){
         var app = express();