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

This commit is contained in:
TJ Holowaychuk 2014-04-12 10:59:08 -07:00
commit 80e1ceb52f
2 changed files with 2 additions and 2 deletions

View file

@ -34,7 +34,7 @@ app.listen(3000);
The following example responds with "Hello World", however first the request flows through
the `x-response-time` and `logging` middleware to mark when the request started, then continue
to yield control through the to the response middleware. When a middleware invokes `yield next`
to yield control through the response middleware. When a middleware invokes `yield next`
the function suspends and passes control to the next middleware defined. After there are no more
middleware to execute downstream, the stack will unwind and each middleware is resumed to perform
its upstream behaviour.

View file

@ -73,7 +73,7 @@ var ct = this.request.type;
// => "image/png"
```
### res.charset
### req.charset
Get request charset when present, or `undefined`: