Merge branch 'download-example'

examples/downloads/app.js

@@ -0,0 +1,32 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('./../../lib/express');
+
+var app = express.createServer();
+
+app.get('/', function(req, res){
+    res.send('<ul>'
+        + '<li>Download <a href="/files/amazing.txt">amazing.txt</a>.</li>'
+        + '<li>Download <a href="/files/missing.txt">missing.txt</a>.</li>'
+        + '</ul>');
+});
+
+app.get('/files/*', function(req, res){
+    var file = req.params[0];
+    res.download(__dirname + '/files/' + file);
+});
+
+app.error(function(err, req, res, next){
+    if (process.ENOENT == err.errno) {
+        res.send('Cant find that file, sorry!');
+    } else {
+        // Not a 404
+        next(err);
+    }
+});
+
+app.listen(3000);
+console.log('Express started on port 3000');

examples/downloads/files/amazing.txt

@@ -0,0 +1 @@
+wow supes cool are you glad you downloaded this?

lib/express/response.js

@@ -130,6 +130,7 @@ http.ServerResponse.prototype.sendfile = function(path, fn){
     var self = this;
     fs.readFile(path, function(err, buf){
         if (err) {
+            delete self.headers['Content-Disposition'];
             if (fn) {
                 fn(err, path);
             } else {

test/response.test.js

@@ -224,6 +224,10 @@ module.exports = {
             res.download(__dirname + '/fixtures/' + req.params[0]);
         });
 
+        app.error(function(err, req, res){
+            res.send(404);
+        })
+
         assert.response(app,
             { url: '/user.json' },
             { body: '{"name":"tj"}', status: 200, headers: {
@@ -237,6 +241,12 @@ module.exports = {
                 'Content-Type': 'application/json',
                 'Content-Disposition': 'attachment; filename="account.json"'
             }});
+
+        assert.response(app,
+            { url: '/missing' },
+            function(res){
+                assert.equal(null, res.headers['content-disposition']);
+            });
     },
 
     'test #cookie()': function(assert){