Merge branch 'master' of github.com:visionmedia/express

bin/express

@@ -195,7 +195,8 @@ var app = [
   , ''
   , 'var express = require(\'express\')'
   , '  , routes = require(\'./routes\')'
-  , '  , http = require(\'http\');'
+  , '  , http = require(\'http\')'
+  , '  , path = require(\'path\');'
   , ''
   , 'var app = express();'
   , ''
@@ -208,7 +209,7 @@ var app = [
   , '  app.use(express.bodyParser());'
   , '  app.use(express.methodOverride());{sess}'
   , '  app.use(app.router);{css}'
-  , '  app.use(express.static(__dirname + \'/public\'));'
+  , '  app.use(express.static(path.join(__dirname, \'public\')));'
   , '});'
   , ''
   , 'app.configure(\'development\', function(){'

lib/response.js

@@ -190,7 +190,7 @@ res.sendfile = function(path, options, fn){
     done = true;
 
     // clean up
-    req.socket.removeListener('error', error);
+    cleanup();
     if (!self.headerSent) self.removeHeader('Content-Disposition');
 
     // callback available
@@ -206,10 +206,15 @@ res.sendfile = function(path, options, fn){
   // streaming
   function stream() {
     if (done) return;
-    req.socket.removeListener('error', error);
+    cleanup();
     if (fn) self.on('finish', fn);
   }
 
+  // cleanup
+  function cleanup() {
+    req.socket.removeListener('error', error);
+  }
+
   // transfer
   var file = send(req, path);
   if (options.root) file.root(options.root);
@@ -218,6 +223,7 @@ res.sendfile = function(path, options, fn){
   file.on('directory', next);
   file.on('stream', stream);
   file.pipe(this);
+  this.on('finish', cleanup);
 };
 
 /**