Merge branch 'master' of github.com:koajs/koa

This commit is contained in:
TJ Holowaychuk 2013-08-31 09:17:16 -07:00
commit b3761b5da0
2 changed files with 4 additions and 5 deletions

View file

@ -115,7 +115,7 @@ app.context = function(obj){
/**
* Return a request handler callback
* for node's native htto server.
* for node's native http server.
*
* @return {Function}
* @api public

View file

@ -1,4 +1,3 @@
/**
* Module dependencies.
*/
@ -592,12 +591,12 @@ module.exports = {
// handler and log.
if (this.headerSent) {
err.headerSent = true;
this.app.emit('error', err);
this.app.emit('error', err, this);
return;
}
// delegate
this.app.emit('error', err);
this.app.emit('error', err, this);
// err.status support
if (err.status) {