3.18.4

deps: should@~4.3.0
deps: proxy-addr@~1.0.4
2026-02-26 08:45:36 +00:00 · 2014-11-23 15:42:03 -05:00 · 2014-11-23 15:36:59 -05:00 · 2014-11-23 15:34:57 -05:00 · 2014-11-23 14:58:56 -05:00 · 2014-11-23 14:58:22 -05:00
68 changed files with 1565 additions and 549 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,26 @@
-coverage/
-.DS_Store
-*.seed
+# OS X
+.DS_Store*
+Icon?
+._*
+
+# Windows
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+
+# Linux
+.directory
+*~
+
+
+# npm
+node_modules
 *.log
-*.csv
-*.dat
-*.out
-*.pid
-*.swp
-*.swo
+*.gz
+
+
+# Coveralls
+coverage
+
+# Benchmarking
 benchmarks/graphs
-testing
-node_modules/
-testing
-test.js
-.idea
--- a/.npmignore
+++ b/.npmignore
@@ -1,10 +0,0 @@
-.git*
-benchmarks/
-coverage/
-docs/
-examples/
-support/
-test/
-testing.js
-.DS_Store
-.travis.yml
--- a/History.md
+++ b/History.md
@@ -1,3 +1,548 @@
+3.18.4 / 2014-11-23
+===================
+
+  * deps: connect@2.27.4
+    - deps: body-parser@~1.9.3
+    - deps: compression@~1.2.1
+    - deps: errorhandler@~1.2.3
+    - deps: express-session@~1.9.2
+    - deps: qs@2.3.3
+    - deps: serve-favicon@~2.1.7
+    - deps: serve-static@~1.5.1
+    - deps: type-is@~1.5.3
+  * deps: etag@~1.5.1
+  * deps: proxy-addr@~1.0.4
+    - deps: ipaddr.js@0.1.5
+
+3.18.3 / 2014-11-09
+===================
+
+  * deps: connect@2.27.3
+    - Correctly invoke async callback asynchronously
+    - deps: csurf@~1.6.3
+
+3.18.2 / 2014-10-28
+===================
+
+  * deps: connect@2.27.2
+    - Fix handling of URLs containing `://` in the path
+    - deps: body-parser@~1.9.2
+    - deps: qs@2.3.2
+
+3.18.1 / 2014-10-22
+===================
+
+  * Fix internal `utils.merge` deprecation warnings
+  * deps: connect@2.27.1
+    - deps: body-parser@~1.9.1
+    - deps: express-session@~1.9.1
+    - deps: finalhandler@0.3.2
+    - deps: morgan@~1.4.1
+    - deps: qs@2.3.0
+    - deps: serve-static@~1.7.1
+  * deps: send@0.10.1
+    - deps: on-finished@~2.1.1
+
+3.18.0 / 2014-10-17
+===================
+
+  * Use `content-disposition` module for `res.attachment`/`res.download`
+    - Sends standards-compliant `Content-Disposition` header
+    - Full Unicode support
+  * Use `etag` module to generate `ETag` headers
+  * deps: connect@2.27.0
+    - Use `http-errors` module for creating errors
+    - Use `utils-merge` module for merging objects
+    - deps: body-parser@~1.9.0
+    - deps: compression@~1.2.0
+    - deps: connect-timeout@~1.4.0
+    - deps: debug@~2.1.0
+    - deps: depd@~1.0.0
+    - deps: express-session@~1.9.0
+    - deps: finalhandler@0.3.1
+    - deps: method-override@~2.3.0
+    - deps: morgan@~1.4.0
+    - deps: response-time@~2.2.0
+    - deps: serve-favicon@~2.1.6
+    - deps: serve-index@~1.5.0
+    - deps: serve-static@~1.7.0
+  * deps: debug@~2.1.0
+    - Implement `DEBUG_FD` env variable support
+  * deps: depd@~1.0.0
+  * deps: send@0.10.0
+    - deps: debug@~2.1.0
+    - deps: depd@~1.0.0
+    - deps: etag@~1.5.0
+
+3.17.8 / 2014-10-15
+===================
+
+  * deps: connect@2.26.6
+    - deps: compression@~1.1.2
+    - deps: csurf@~1.6.2
+    - deps: errorhandler@~1.2.2
+
+3.17.7 / 2014-10-08
+===================
+
+  * deps: connect@2.26.5
+    - Fix accepting non-object arguments to `logger`
+    - deps: serve-static@~1.6.4
+
+3.17.6 / 2014-10-02
+===================
+
+  * deps: connect@2.26.4
+    - deps: morgan@~1.3.2
+    - deps: type-is@~1.5.2
+
+3.17.5 / 2014-09-24
+===================
+
+  * deps: connect@2.26.3
+    - deps: body-parser@~1.8.4
+    - deps: serve-favicon@~2.1.5
+    - deps: serve-static@~1.6.3
+  * deps: proxy-addr@~1.0.3
+    - Use `forwarded` npm module
+  * deps: send@0.9.3
+    - deps: etag@~1.4.0
+
+3.17.4 / 2014-09-19
+===================
+
+  * deps: connect@2.26.2
+    - deps: body-parser@~1.8.3
+    - deps: qs@2.2.4
+
+3.17.3 / 2014-09-18
+===================
+
+  * deps: proxy-addr@~1.0.2
+    - Fix a global leak when multiple subnets are trusted
+    - deps: ipaddr.js@0.1.3
+
+3.17.2 / 2014-09-15
+===================
+
+  * Use `crc` instead of `buffer-crc32` for speed
+  * deps: connect@2.26.1
+    - deps: body-parser@~1.8.2
+    - deps: depd@0.4.5
+    - deps: express-session@~1.8.2
+    - deps: morgan@~1.3.1
+    - deps: serve-favicon@~2.1.3
+    - deps: serve-static@~1.6.2
+  * deps: depd@0.4.5
+  * deps: send@0.9.2
+    - deps: depd@0.4.5
+    - deps: etag@~1.3.1
+    - deps: range-parser@~1.0.2
+
+3.17.1 / 2014-09-08
+===================
+
+  * Fix error in `req.subdomains` on empty host
+
+3.17.0 / 2014-09-08
+===================
+
+  * Support IP address host in `req.subdomains`
+  * deps: connect@2.26.0
+    - deps: body-parser@~1.8.1
+    - deps: compression@~1.1.0
+    - deps: connect-timeout@~1.3.0
+    - deps: cookie-parser@~1.3.3
+    - deps: cookie-signature@1.0.5
+    - deps: csurf@~1.6.1
+    - deps: debug@~2.0.0
+    - deps: errorhandler@~1.2.0
+    - deps: express-session@~1.8.1
+    - deps: finalhandler@0.2.0
+    - deps: fresh@0.2.4
+    - deps: media-typer@0.3.0
+    - deps: method-override@~2.2.0
+    - deps: morgan@~1.3.0
+    - deps: qs@2.2.3
+    - deps: serve-favicon@~2.1.3
+    - deps: serve-index@~1.2.1
+    - deps: serve-static@~1.6.1
+    - deps: type-is@~1.5.1
+    - deps: vhost@~3.0.0
+  * deps: cookie-signature@1.0.5
+  * deps: debug@~2.0.0
+  * deps: fresh@0.2.4
+  * deps: media-typer@0.3.0
+    - Throw error when parameter format invalid on parse
+  * deps: range-parser@~1.0.2
+  * deps: send@0.9.1
+    - Add `lastModified` option
+    - Use `etag` to generate `ETag` header
+    - deps: debug@~2.0.0
+    - deps: fresh@0.2.4
+  * deps: vary@~1.0.0
+    - Accept valid `Vary` header string as `field`
+
+3.16.10 / 2014-09-04
+====================
+
+  * deps: connect@2.25.10
+    - deps: serve-static@~1.5.4
+  * deps: send@0.8.5
+    - Fix a path traversal issue when using `root`
+    - Fix malicious path detection for empty string path
+
+3.16.9 / 2014-08-29
+===================
+
+  * deps: connect@2.25.9
+    - deps: body-parser@~1.6.7
+    - deps: qs@2.2.2
+
+3.16.8 / 2014-08-27
+===================
+
+  * deps: connect@2.25.8
+    - deps: body-parser@~1.6.6
+    - deps: csurf@~1.4.1
+    - deps: qs@2.2.0
+
+3.16.7 / 2014-08-18
+===================
+
+  * deps: connect@2.25.7
+    - deps: body-parser@~1.6.5
+    - deps: express-session@~1.7.6
+    - deps: morgan@~1.2.3
+    - deps: serve-static@~1.5.3
+  * deps: send@0.8.3
+    - deps: destroy@1.0.3
+    - deps: on-finished@2.1.0
+
+3.16.6 / 2014-08-14
+===================
+
+  * deps: connect@2.25.6
+    - deps: body-parser@~1.6.4
+    - deps: qs@1.2.2
+    - deps: serve-static@~1.5.2
+  * deps: send@0.8.2
+    - Work around `fd` leak in Node.js 0.10 for `fs.ReadStream`
+
+3.16.5 / 2014-08-11
+===================
+
+  * deps: connect@2.25.5
+    - Fix backwards compatibility in `logger`
+
+3.16.4 / 2014-08-10
+===================
+
+  * Fix original URL parsing in `res.location`
+  * deps: connect@2.25.4
+    - Fix `query` middleware breaking with argument
+    - deps: body-parser@~1.6.3
+    - deps: compression@~1.0.11
+    - deps: connect-timeout@~1.2.2
+    - deps: express-session@~1.7.5
+    - deps: method-override@~2.1.3
+    - deps: on-headers@~1.0.0
+    - deps: parseurl@~1.3.0
+    - deps: qs@1.2.1
+    - deps: response-time@~2.0.1
+    - deps: serve-index@~1.1.6
+    - deps: serve-static@~1.5.1
+  * deps: parseurl@~1.3.0
+
+3.16.3 / 2014-08-07
+===================
+
+  * deps: connect@2.25.3
+    - deps: multiparty@3.3.2
+
+3.16.2 / 2014-08-07
+===================
+
+  * deps: connect@2.25.2
+    - deps: body-parser@~1.6.2
+    - deps: qs@1.2.0
+
+3.16.1 / 2014-08-06
+===================
+
+  * deps: connect@2.25.1
+    - deps: body-parser@~1.6.1
+    - deps: qs@1.1.0
+
+3.16.0 / 2014-08-05
+===================
+
+  * deps: connect@2.25.0
+    - deps: body-parser@~1.6.0
+    - deps: compression@~1.0.10
+    - deps: csurf@~1.4.0
+    - deps: express-session@~1.7.4
+    - deps: qs@1.0.2
+    - deps: serve-static@~1.5.0
+  * deps: send@0.8.1
+    - Add `extensions` option
+
+3.15.3 / 2014-08-04
+===================
+
+  * fix `res.sendfile` regression for serving directory index files
+  * deps: connect@2.24.3
+    - deps: serve-index@~1.1.5
+    - deps: serve-static@~1.4.4
+  * deps: send@0.7.4
+    - Fix incorrect 403 on Windows and Node.js 0.11
+    - Fix serving index files without root dir
+
+3.15.2 / 2014-07-27
+===================
+
+  * deps: connect@2.24.2
+    - deps: body-parser@~1.5.2
+    - deps: depd@0.4.4
+    - deps: express-session@~1.7.2
+    - deps: morgan@~1.2.2
+    - deps: serve-static@~1.4.2
+  * deps: depd@0.4.4
+    - Work-around v8 generating empty stack traces
+  * deps: send@0.7.2
+    - deps: depd@0.4.4
+
+3.15.1 / 2014-07-26
+===================
+
+  * deps: connect@2.24.1
+    - deps: body-parser@~1.5.1
+    - deps: depd@0.4.3
+    - deps: express-session@~1.7.1
+    - deps: morgan@~1.2.1
+    - deps: serve-index@~1.1.4
+    - deps: serve-static@~1.4.1
+  * deps: depd@0.4.3
+    - Fix exception when global `Error.stackTraceLimit` is too low
+  * deps: send@0.7.1
+    - deps: depd@0.4.3
+
+3.15.0 / 2014-07-22
+===================
+
+  * Fix `req.protocol` for proxy-direct connections
+  * Pass options from `res.sendfile` to `send`
+  * deps: connect@2.24.0
+    - deps: body-parser@~1.5.0
+    - deps: compression@~1.0.9
+    - deps: connect-timeout@~1.2.1
+    - deps: debug@1.0.4
+    - deps: depd@0.4.2
+    - deps: express-session@~1.7.0
+    - deps: finalhandler@0.1.0
+    - deps: method-override@~2.1.2
+    - deps: morgan@~1.2.0
+    - deps: multiparty@3.3.1
+    - deps: parseurl@~1.2.0
+    - deps: serve-static@~1.4.0
+  * deps: debug@1.0.4
+  * deps: depd@0.4.2
+    - Add `TRACE_DEPRECATION` environment variable
+    - Remove non-standard grey color from color output
+    - Support `--no-deprecation` argument
+    - Support `--trace-deprecation` argument
+  * deps: parseurl@~1.2.0
+    - Cache URLs based on original value
+    - Remove no-longer-needed URL mis-parse work-around
+    - Simplify the "fast-path" `RegExp`
+  * deps: send@0.7.0
+    - Add `dotfiles` option
+    - Cap `maxAge` value to 1 year
+    - deps: debug@1.0.4
+    - deps: depd@0.4.2
+
+3.14.0 / 2014-07-11
+===================
+
+ * add explicit "Rosetta Flash JSONP abuse" protection
+   - previous versions are not vulnerable; this is just explicit protection
+ * deprecate `res.redirect(url, status)` -- use `res.redirect(status, url)` instead
+ * fix `res.send(status, num)` to send `num` as json (not error)
+ * remove unnecessary escaping when `res.jsonp` returns JSON response
+ * deps: basic-auth@1.0.0
+   - support empty password
+   - support empty username
+ * deps: connect@2.23.0
+   - deps: debug@1.0.3
+   - deps: express-session@~1.6.4
+   - deps: method-override@~2.1.0
+   - deps: parseurl@~1.1.3
+   - deps: serve-static@~1.3.1
+  * deps: debug@1.0.3
+    - Add support for multiple wildcards in namespaces
+  * deps: methods@1.1.0
+    - add `CONNECT`
+  * deps: parseurl@~1.1.3
+    - faster parsing of href-only URLs
+
+3.13.0 / 2014-07-03
+===================
+
+ * add deprecation message to `app.configure`
+ * add deprecation message to `req.auth`
+ * use `basic-auth` to parse `Authorization` header
+ * deps: connect@2.22.0
+   - deps: csurf@~1.3.0
+   - deps: express-session@~1.6.1
+   - deps: multiparty@3.3.0
+   - deps: serve-static@~1.3.0
+ * deps: send@0.5.0
+   - Accept string for `maxage` (converted by `ms`)
+   - Include link in default redirect response
+
+3.12.1 / 2014-06-26
+===================
+
+ * deps: connect@2.21.1
+   - deps: cookie-parser@1.3.2
+   - deps: cookie-signature@1.0.4
+   - deps: express-session@~1.5.2
+   - deps: type-is@~1.3.2
+ * deps: cookie-signature@1.0.4
+   - fix for timing attacks
+
+3.12.0 / 2014-06-21
+===================
+
+ * use `media-typer` to alter content-type charset
+ * deps: connect@2.21.0
+   - deprecate `connect(middleware)` -- use `app.use(middleware)` instead
+   - deprecate `connect.createServer()` -- use `connect()` instead
+   - fix `res.setHeader()` patch to work with with get -> append -> set pattern
+   - deps: compression@~1.0.8
+   - deps: errorhandler@~1.1.1
+   - deps: express-session@~1.5.0
+   - deps: serve-index@~1.1.3
+
+3.11.0 / 2014-06-19
+===================
+
+ * deprecate things with `depd` module
+ * deps: buffer-crc32@0.2.3
+ * deps: connect@2.20.2
+   - deprecate `verify` option to `json` -- use `body-parser` npm module instead
+   - deprecate `verify` option to `urlencoded` -- use `body-parser` npm module instead
+   - deprecate things with `depd` module
+   - use `finalhandler` for final response handling
+   - use `media-typer` to parse `content-type` for charset
+   - deps: body-parser@1.4.3
+   - deps: connect-timeout@1.1.1
+   - deps: cookie-parser@1.3.1
+   - deps: csurf@1.2.2
+   - deps: errorhandler@1.1.0
+   - deps: express-session@1.4.0
+   - deps: multiparty@3.2.9
+   - deps: serve-index@1.1.2
+   - deps: type-is@1.3.1
+   - deps: vhost@2.0.0
+
+3.10.5 / 2014-06-11
+===================
+
+ * deps: connect@2.19.6
+   - deps: body-parser@1.3.1
+   - deps: compression@1.0.7
+   - deps: debug@1.0.2
+   - deps: serve-index@1.1.1
+   - deps: serve-static@1.2.3
+ * deps: debug@1.0.2
+ * deps: send@0.4.3
+   - Do not throw un-catchable error on file open race condition
+   - Use `escape-html` for HTML escaping
+   - deps: debug@1.0.2
+   - deps: finished@1.2.2
+   - deps: fresh@0.2.2
+
+3.10.4 / 2014-06-09
+===================
+
+ * deps: connect@2.19.5
+   - fix "event emitter leak" warnings
+   - deps: csurf@1.2.1
+   - deps: debug@1.0.1
+   - deps: serve-static@1.2.2
+   - deps: type-is@1.2.1
+ * deps: debug@1.0.1
+ * deps: send@0.4.2
+   - fix "event emitter leak" warnings
+   - deps: finished@1.2.1
+   - deps: debug@1.0.1
+
+3.10.3 / 2014-06-05
+===================
+
+ * use `vary` module for `res.vary`
+ * deps: connect@2.19.4
+   - deps: errorhandler@1.0.2
+   - deps: method-override@2.0.2
+   - deps: serve-favicon@2.0.1
+ * deps: debug@1.0.0
+
+3.10.2 / 2014-06-03
+===================
+
+ * deps: connect@2.19.3
+   - deps: compression@1.0.6
+
+3.10.1 / 2014-06-03
+===================
+
+ * deps: connect@2.19.2
+   - deps: compression@1.0.4
+ * deps: proxy-addr@1.0.1
+
+3.10.0 / 2014-06-02
+===================
+
+ * deps: connect@2.19.1
+   - deprecate `methodOverride()` -- use `method-override` npm module instead
+   - deps: body-parser@1.3.0
+   - deps: method-override@2.0.1
+   - deps: multiparty@3.2.8
+   - deps: response-time@2.0.0
+   - deps: serve-static@1.2.1
+ * deps: methods@1.0.1
+ * deps: send@0.4.1
+   - Send `max-age` in `Cache-Control` in correct format
+
+3.9.0 / 2014-05-30
+==================
+
+ * custom etag control with `app.set('etag', val)`
+   - `app.set('etag', function(body, encoding){ return '"etag"' })` custom etag generation
+   - `app.set('etag', 'weak')` weak tag
+   - `app.set('etag', 'strong')` strong etag
+   - `app.set('etag', false)` turn off
+   - `app.set('etag', true)` standard etag
+ * Include ETag in HEAD requests
+ * mark `res.send` ETag as weak and reduce collisions
+ * update connect to 2.18.0
+   - deps: compression@1.0.3
+   - deps: serve-index@1.1.0
+   - deps: serve-static@1.2.0
+ * update send to 0.4.0
+   - Calculate ETag with md5 for reduced collisions
+   - Ignore stream errors after request ends
+   - deps: debug@0.8.1
+
+3.8.1 / 2014-05-27
+==================
+
+ * update connect to 2.17.3
+   - deps: body-parser@1.2.2
+   - deps: express-session@1.2.1
+   - deps: method-override@1.0.2
+
 3.8.0 / 2014-05-21
 ==================

--- a/Readme.md
+++ b/Readme.md
@@ -2,7 +2,10 @@

  Fast, unopinionated, minimalist web framework for [node](http://nodejs.org).

-  [![NPM version](https://badge.fury.io/js/express.svg)](http://badge.fury.io/js/express) [![Build Status](https://travis-ci.org/visionmedia/express.svg?branch=master)](https://travis-ci.org/visionmedia/express) [![Coverage Status](https://img.shields.io/coveralls/visionmedia/express.svg)](https://coveralls.io/r/visionmedia/express) [![Gittip](http://img.shields.io/gittip/visionmedia.svg)](https://www.gittip.com/visionmedia/)
+  [![NPM version](https://img.shields.io/npm/v/express.svg?style=flat)](https://www.npmjs.org/package/express)
+  [![Build Status](https://img.shields.io/travis/strongloop/express.svg?style=flat)](https://travis-ci.org/strongloop/express)
+  [![Coverage Status](https://img.shields.io/coveralls/strongloop/express.svg?style=flat)](https://coveralls.io/r/strongloop/express)
+  [![Gittip](https://img.shields.io/gittip/dougwilson.svg?style=flat)](https://www.gittip.com/dougwilson/)

 ```js
 var express = require('express');
@@ -62,11 +65,11 @@ app.listen(3000);

 ## More Information

-  * [Website and Documentation](http://expressjs.com/) stored at [visionmedia/expressjs.com](https://github.com/visionmedia/expressjs.com)
+  * [Website and Documentation](http://expressjs.com/) stored at [strongloop/expressjs.com](https://github.com/strongloop/expressjs.com)
  * Join #express on freenode
  * [Google Group](http://groups.google.com/group/express-js) for discussion
  * Follow [tjholowaychuk](http://twitter.com/tjholowaychuk) on twitter for updates
-  * Visit the [Wiki](http://github.com/visionmedia/express/wiki)
+  * Visit the [Wiki](http://github.com/strongloop/express/wiki)
  * [Русскоязычная документация](http://jsman.ru/express/)
  * Run express examples [online](https://runnable.com/express)

@@ -74,7 +77,7 @@ app.listen(3000);

 Clone the Express repo, then install the dev dependencies to install all the example / test suite dependencies:

-    $ git clone git://github.com/visionmedia/express.git --depth 1
+    $ git clone git://github.com/strongloop/express.git --depth 1
    $ cd express
    $ npm install

@@ -100,7 +103,7 @@ $ npm test

 ## Contributors

-  https://github.com/visionmedia/express/graphs/contributors
+  https://github.com/strongloop/express/graphs/contributors

 ## License

--- a/bin/express
+++ b/bin/express
@@ -335,7 +335,7 @@ function createApplicationAt(path) {

    // Session support
    app = app.replace('{sess}', program.sessions
-      ? eol + 'app.use(express.cookieParser(\'your secret here\'));' + eol + 'app.use(express.session());'
+      ? eol + 'app.use(express.session({ secret: \'your secret here\' }));'
      : '');

    // Template support
--- a/examples/auth/app.js
+++ b/examples/auth/app.js
@@ -14,9 +14,8 @@ app.set('views', __dirname + '/views');

 // middleware

-app.use(express.bodyParser());
-app.use(express.cookieParser('shhhh, very secret'));
-app.use(express.session());
+app.use(express.urlencoded({ extended: false }));
+app.use(express.session({ secret: 'shhhh, very secret' }));

 // Session-persisted message middleware

@@ -118,6 +117,7 @@ app.post('/login', function(req, res){
  });
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
--- a/examples/big-view/index.js
+++ b/examples/big-view/index.js
@@ -20,5 +20,8 @@ app.get('/', function(req, res){
  res.render('pets', { pets: pets });
 });

-app.listen(3000);
-console.log('Express listening on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/content-negotiation/index.js
+++ b/examples/content-negotiation/index.js
@@ -37,7 +37,8 @@ function format(path) {

 app.get('/users', format('./users'));

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
-  console.log('listening on port 3000');
+  console.log('Express started on port 3000');
 }
--- a/examples/cookie-sessions/index.js
+++ b/examples/cookie-sessions/index.js
@@ -26,7 +26,8 @@ function count(req, res) {
  res.send('viewed ' + n + ' times\n');
 }

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
-  console.log('Express server listening on port 3000');
-}
+  console.log('Express started on port 3000');
+}
--- a/examples/cookies/app.js
+++ b/examples/cookies/app.js
@@ -15,8 +15,7 @@ var express = require('../../')
 app.use(express.favicon());

 // custom log format
-if ('test' != process.env.NODE_ENV)
-  app.use(express.logger(':method :url'));
+if ('test' != process.env.NODE_ENV) app.use(express.logger(':method :url'));

 // parses request cookies, populating
 // req.cookies and req.signedCookies
@@ -48,7 +47,8 @@ app.post('/', function(req, res){
  res.redirect('back');
 });

-if (!module.parent){
+/* istanbul ignore next */
+if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
-}
+}
--- a/examples/downloads/app.js
+++ b/examples/downloads/app.js
@@ -38,7 +38,8 @@ app.use(function(err, req, res, next){
  }
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
-}
+}
--- a/examples/ejs/index.js
+++ b/examples/ejs/index.js
@@ -44,7 +44,8 @@ app.get('/', function(req, res){
  });
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
-  console.log('Express app started on port 3000');
+  console.log('Express started on port 3000');
 }
--- a/examples/error-pages/index.js
+++ b/examples/error-pages/index.js
@@ -17,9 +17,7 @@ app.enable('verbose errors');

 // disable them in production
 // use $ NODE_ENV=production node examples/error-pages
-if ('production' == app.settings.env) {
-  app.disable('verbose errors');
-}
+if ('production' == app.settings.env) app.disable('verbose errors');

 app.use(express.favicon());

@@ -106,7 +104,8 @@ app.get('/500', function(req, res, next){
  next(new Error('keyboard cat!'));
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
-  silent || console.log('Express started on port 3000');
-}
+  console.log('Express started on port 3000');
+}
--- a/examples/error/index.js
+++ b/examples/error/index.js
@@ -42,7 +42,8 @@ app.get('/next', function(req, res, next){
  });
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
-}
+}
--- a/examples/expose-data-to-client/index.js
+++ b/examples/expose-data-to-client/index.js
@@ -56,5 +56,8 @@ app.get('/user', function(req, res){
  res.render('page');
 });

-app.listen(3000);
-console.log('app listening on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/hello-world/index.js
+++ b/examples/hello-world/index.js
@@ -7,5 +7,8 @@ app.get('/', function(req, res){
  res.send('Hello World');
 });

-app.listen(3000);
-console.log('Express started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/jade/index.js
+++ b/examples/jade/index.js
@@ -41,5 +41,8 @@ app.get('/', function(req, res){
  res.render('users', { users: users });
 });

-app.listen(3000);
-console.log('Express app started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/markdown/index.js
+++ b/examples/markdown/index.js
@@ -39,6 +39,7 @@ app.get('/fail', function(req, res){
  res.render('missing', { title: 'Markdown Example' });
 })

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
--- a/examples/multipart/index.js
+++ b/examples/multipart/index.js
@@ -30,7 +30,8 @@ app.post('/', function(req, res, next){
    , req.body.title));
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
-}
+}
--- a/examples/mvc/index.js
+++ b/examples/mvc/index.js
@@ -31,11 +31,10 @@ if (!module.parent) app.use(express.logger('dev'));
 app.use(express.static(__dirname + '/public'));

 // session support
-app.use(express.cookieParser('some secret here'));
-app.use(express.session());
+app.use(express.session({ secret: 'some secret here' }));

 // parse request bodies (req.body)
-app.use(express.bodyParser());
+app.use(express.urlencoded({ extended: true }));

 // support _method (PUT in forms etc)
 app.use(express.methodOverride());
@@ -86,7 +85,8 @@ app.use(function(req, res, next){
  res.status(404).render('404', { url: req.originalUrl });
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
-  console.log('\n  listening on port 3000\n');
+  console.log('Express started on port 3000');
 }
--- a/examples/online/index.js
+++ b/examples/online/index.js
@@ -50,5 +50,8 @@ app.get('/', function(req, res, next){
  });
 });

-app.listen(3000);
-console.log('listening on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/params/app.js
+++ b/examples/params/app.js
@@ -19,8 +19,8 @@ var users = [
 // Convert :to and :from to integers

 app.param(['to', 'from'], function(req, res, next, num, name){ 
-  req.params[name] = num = parseInt(num, 10);
-  if( isNaN(num) ){
+  req.params[name] = parseInt(num, 10);
+  if( isNaN(req.params[name]) ){
    next(new Error('failed to parseInt '+num));
  } else {
    next();
@@ -64,7 +64,8 @@ app.get('/users/:from-:to', function(req, res, next){
  res.send('users ' + names.slice(from, to).join(', '));
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
-}
+}
--- a/examples/resource/app.js
+++ b/examples/resource/app.js
@@ -18,7 +18,10 @@ app.resource = function(path, obj) {
    obj.range(req, res, a, b, format);
  });
  this.get(path + '/:id', obj.show);
-  this.delete(path + '/:id', obj.destroy);
+  this.delete(path + '/:id', function(req, res){
+    var id = parseInt(req.params.id, 10);
+    obj.destroy(req, res, id);
+  });
 };

 // Fake records
@@ -41,8 +44,7 @@ var User = {
  show: function(req, res){
    res.send(users[req.params.id] || { error: 'Cannot find user' });
  },
-  destroy: function(req, res){
-    var id = req.params.id;
+  destroy: function(req, res, id){
    var destroyed = id in users;
    delete users[id];
    res.send(destroyed ? 'destroyed' : 'Cannot find user');
@@ -85,7 +87,8 @@ app.get('/', function(req, res){
  ].join('\n')); 
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
-}
+}
--- a/examples/route-map/index.js
+++ b/examples/route-map/index.js
@@ -60,4 +60,8 @@ app.map({
  }
 });

-app.listen(3000);
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/route-middleware/index.js
+++ b/examples/route-middleware/index.js
@@ -81,5 +81,8 @@ app.delete('/user/:id', loadUser, andRestrictTo('admin'), function(req, res){
  res.send('Deleted user ' + req.user.name);
 });

-app.listen(3000);
-console.log('Express app started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/route-separation/index.js
+++ b/examples/route-separation/index.js
@@ -36,5 +36,8 @@ app.put('/user/:id/edit', user.update);

 app.get('/posts', post.list);

-app.listen(3000);
-console.log('Express app started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/search/index.js
+++ b/examples/search/index.js
@@ -57,5 +57,8 @@ app.get('/client.js', function(req, res){
  res.sendfile(__dirname + '/client.js');
 });

-app.listen(3000);
-console.log('app listening on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/session/index.js
+++ b/examples/session/index.js
@@ -9,13 +9,8 @@ var app = express();

 app.use(express.logger('dev'));

-// Required by session() middleware
-// pass the secret for signed cookies
-// (required by session())
-app.use(express.cookieParser('keyboard cat'));
-
 // Populates req.session
-app.use(express.session());
+app.use(express.session({ secret: 'keyboard cat' }));

 app.get('/', function(req, res){
  var body = '';
@@ -28,5 +23,8 @@ app.get('/', function(req, res){
  res.send(body + '<p>viewed <strong>' + req.session.views + '</strong> times.</p>');
 });

-app.listen(3000);
-console.log('Express app started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/session/redis.js
+++ b/examples/session/redis.js
@@ -10,13 +10,8 @@ var app = express();

 app.use(express.logger('dev'));

-// Required by session() middleware
-// pass the secret for signed cookies
-// (required by session())
-app.use(express.cookieParser('keyboard cat'));
-
 // Populates req.session
-app.use(express.session({ store: new RedisStore }));
+app.use(express.session({ store: new RedisStore, secret: 'keyboard cat' }));

 app.get('/', function(req, res){
  var body = '';
--- a/examples/vhost/index.js
+++ b/examples/vhost/index.js
@@ -42,5 +42,8 @@ var app = express();
 app.use(express.vhost('*.example.com', redirect)) // Serves all subdomains via Redirect app
 app.use(express.vhost('example.com', main)); // Serves top level domain via Main server app 

-app.listen(3000);
-console.log('Express app started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/view-constructor/github-view.js
+++ b/examples/view-constructor/github-view.js
@@ -35,13 +35,13 @@ function GithubView(name, options){
 GithubView.prototype.render = function(options, fn){
  var self = this;
  var opts = {
-    host: 'rawgithub.com',
-    port: 80,
+    host: 'raw.githubusercontent.com',
+    port: 443,
    path: this.path,
    method: 'GET'
  };

-  http.request(opts, function(res) {
+  https.request(opts, function(res) {
    var buf = '';
    res.setEncoding('utf8');
    res.on('data', function(str){ buf += str });
--- a/examples/view-constructor/index.js
+++ b/examples/view-constructor/index.js
@@ -24,7 +24,7 @@ app.engine('md', function(str, options, fn){
 })

 // pointing to a particular github repo to load files from it
-app.set('views', 'visionmedia/express');
+app.set('views', 'strongloop/express');

 // register a new view constructor
 app.set('view', GithubView);
@@ -37,10 +37,11 @@ app.get('/', function(req, res){
 })

 app.get('/Readme.md', function(req, res){
-  // rendering a view from https://github.com/visionmedia/express/blob/master/Readme.md
+  // rendering a view from https://github.com/strongloop/express/blob/master/Readme.md
  res.render('Readme.md');
 })

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
  console.log('Express started on port 3000');
--- a/examples/view-locals/index.js
+++ b/examples/view-locals/index.js
@@ -142,5 +142,8 @@ app.all('/api/*', function(req, res, next){

 */

-app.listen(3000);
-console.log('Application listening on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}
--- a/examples/web-service/index.js
+++ b/examples/web-service/index.js
@@ -73,7 +73,7 @@ var apiKeys = ['foo', 'bar', 'baz'];
 // these two objects will serve as our faux database

 var repos = [
-    { name: 'express', url: 'http://github.com/visionmedia/express' }
+    { name: 'express', url: 'http://github.com/strongloop/express' }
  , { name: 'stylus', url: 'http://github.com/learnboost/stylus' }
  , { name: 'cluster', url: 'http://github.com/learnboost/cluster' }
 ];
@@ -109,7 +109,8 @@ app.get('/api/user/:name/repos', function(req, res, next){
  else next();
 });

+/* istanbul ignore next */
 if (!module.parent) {
  app.listen(3000);
-  console.log('Express server listening on port 3000');
-}
+  console.log('Express started on port 3000');
+}
--- a/lib/application.js
+++ b/lib/application.js
@@ -8,11 +8,12 @@ var connect = require('connect')
  , middleware = require('./middleware')
  , debug = require('debug')('express:application')
  , locals = require('./utils').locals
+  , compileETag = require('./utils').compileETag
  , compileTrust = require('./utils').compileTrust
  , View = require('./view')
-  , utils = connect.utils
-  , deprecate = require('./utils').deprecate
  , http = require('http');
+var deprecate = require('depd')('express');
+var merge = require('utils-merge');

 /**
 * Application prototype.
@@ -46,11 +47,13 @@ app.init = function(){
 app.defaultConfiguration = function(){
  // default settings
  this.enable('x-powered-by');
-  this.enable('etag');
-  this.set('env', process.env.NODE_ENV || 'development');
+  this.set('etag', 'weak');
+  var env = process.env.NODE_ENV || 'development';
+  this.set('env', env);
  this.set('subdomain offset', 2);
  this.set('trust proxy', false);
-  debug('booting in %s mode', this.get('env'));
+
+  debug('booting in %s mode', env);

  // implicit middleware
  this.use(connect.query());
@@ -85,13 +88,13 @@ app.defaultConfiguration = function(){
  this.set('views', process.cwd() + '/views');
  this.set('jsonp callback name', 'callback');

-  this.configure('development', function(){
+  if (env === 'development') {
    this.set('json spaces', 2);
-  });
+  }

-  this.configure('production', function(){
+  if (env === 'production') {
    this.enable('view cache');
-  });
+  }
 };

 /**
@@ -251,18 +254,27 @@ app.param = function(name, fn){
 */

 app.set = function(setting, val){
-  if (1 == arguments.length) {
+  if (arguments.length === 1) {
+    // app.get(setting)
    return this.settings[setting];
-  } else {
-    this.settings[setting] = val;
-
-    if (setting === 'trust proxy') {
-      debug('compile trust proxy %j', val);
-      this.set('trust proxy fn', compileTrust(val));
-    }
-
-    return this;
  }
+
+  // set value
+  this.settings[setting] = val;
+
+  // trigger matched settings
+  switch (setting) {
+    case 'etag':
+      debug('compile etag %s', val);
+      this.set('etag fn', compileETag(val));
+      break;
+    case 'trust proxy':
+      debug('compile trust proxy %s', val);
+      this.set('trust proxy fn', compileTrust(val));
+      break;
+  }
+
+  return this;
 };

 /**
@@ -401,6 +413,9 @@ app.configure = function(env, fn){
  return this;
 };

+app.configure = deprecate.function(app.configure,
+  'app.configure: Check app.get(\'env\') in an if statement');
+
 /**
 * Delegate `.VERB(...)` calls to `router.VERB(...)`.
 */
@@ -438,7 +453,7 @@ app.all = function(path){

 // del -> delete alias

-app.del = deprecate(app.delete, 'app.del: Use app.delete instead');
+app.del = deprecate.function(app.delete, 'app.del: Use app.delete instead');

 /**
 * Render the given view `name` name with `options`
@@ -469,13 +484,15 @@ app.render = function(name, options, fn){
  }

  // merge app.locals
-  utils.merge(opts, this.locals);
+  merge(opts, this.locals);

  // merge options._locals
-  if (options._locals) utils.merge(opts, options._locals);
+  if (options._locals) {
+    merge(opts, options._locals);
+  }

  // merge options
-  utils.merge(opts, options);
+  merge(opts, options);

  // set .cache unless explicitly provided
  opts.cache = null == opts.cache
--- a/lib/express.js
+++ b/lib/express.js
@@ -2,15 +2,15 @@
 * Module dependencies.
 */

-var merge = require('merge-descriptors');
+var deprecate = require('depd')('express');
+var mixin = require('merge-descriptors');
+var merge = require('utils-merge');
 var connect = require('connect')
  , proto = require('./application')
  , Route = require('./router/route')
  , Router = require('./router')
  , req = require('./request')
-  , res = require('./response')
-  , deprecate = require('./utils').deprecate
-  , utils = connect.utils;
+  , res = require('./response');

 /**
 * Expose `createApplication()`.
@@ -33,7 +33,7 @@ exports.mime = connect.mime;

 function createApplication() {
  var app = connect();
-  utils.merge(app, proto);
+  merge(app, proto);
  app.request = { __proto__: req, app: app };
  app.response = { __proto__: res, app: app };
  app.init();
@@ -45,13 +45,13 @@ function createApplication() {
 * for example `express.logger` etc.
 */

-merge(exports, connect.middleware);
+mixin(exports, connect.middleware);

 /**
 * Deprecated createServer().
 */

-exports.createServer = deprecate(createApplication,
+exports.createServer = deprecate.function(createApplication,
  'createServer() is deprecated\n' +
  'express applications no longer inherit from http.Server\n' +
  'please use:\n' +
--- a/lib/request.js
+++ b/lib/request.js
@@ -3,6 +3,8 @@
 * Module dependencies.
 */

+var auth = require('basic-auth');
+var deprecate = require('depd')('express');
 var http = require('http')
  , utils = require('./utils')
  , connect = require('connect')
@@ -11,6 +13,7 @@ var http = require('http')
  , parse = require('parseurl')
  , proxyaddr = require('proxy-addr')
  , mime = connect.mime;
+var isIP = require('net').isIP;

 /**
 * Request prototype.
@@ -339,7 +342,9 @@ req.is = function(type){
 * Return the protocol string "http" or "https"
 * when requested with TLS. When the "trust proxy"
 * setting trusts the socket address, the
- * "X-Forwarded-Proto" header field will be trusted.
+ * "X-Forwarded-Proto" header field will be trusted
+ * and used if present.
+ *
 * If you're running behind a reverse proxy that
 * supplies https for you this may be enabled.
 *
@@ -348,17 +353,18 @@ req.is = function(type){
 */

 req.__defineGetter__('protocol', function(){
+  var proto = this.connection.encrypted
+    ? 'https'
+    : 'http';
  var trust = this.app.get('trust proxy fn');

  if (!trust(this.connection.remoteAddress)) {
-    return this.connection.encrypted
-      ? 'https'
-      : 'http';
+    return proto;
  }

  // Note: X-Forwarded-Proto is normally only ever a
  //       single value, but this is to be safe.
-  var proto = this.get('X-Forwarded-Proto') || 'http';
+  proto = this.get('X-Forwarded-Proto') || proto;
  return proto.split(/\s*,\s*/)[0];
 });

@@ -422,20 +428,13 @@ req.__defineGetter__('ips', function(){
 */

 req.__defineGetter__('auth', function(){
-  // missing
-  var auth = this.get('Authorization');
-  if (!auth) return;
-
-  // malformed
-  var parts = auth.split(' ');
-  if ('basic' != parts[0].toLowerCase()) return;
-  if (!parts[1]) return;
-  auth = parts[1];
+  deprecate('req.auth: Use basic-auth npm module instead');

  // credentials
-  auth = new Buffer(auth, 'base64').toString().match(/^([^:]*):(.*)$/);
-  if (!auth) return;
-  return { username: auth[1], password: auth[2] };
+  var creds = auth(this);
+  if (!creds) return;
+
+  return { username: creds.name, password: creds.pass };
 });

 /**
@@ -454,11 +453,16 @@ req.__defineGetter__('auth', function(){
 */

 req.__defineGetter__('subdomains', function(){
+  var host = this.host;
+
+  if (!host) return [];
+
  var offset = this.app.get('subdomain offset');
-  return (this.host || '')
-    .split('.')
-    .reverse()
-    .slice(offset);
+  var subdomains = !isIP(host)
+    ? host.split('.').reverse()
+    : [host];
+
+  return subdomains.slice(offset);
 });

 /**
--- a/lib/response.js
+++ b/lib/response.js
@@ -2,16 +2,19 @@
 * Module dependencies.
 */

+var contentDisposition = require('content-disposition');
+var deprecate = require('depd')('express');
+var escapeHtml = require('escape-html');
+var merge = require('utils-merge');
+var parseUrl = require('parseurl');
+var vary = require('vary');
 var http = require('http')
  , path = require('path')
  , connect = require('connect')
-  , utils = connect.utils
  , sign = require('cookie-signature').sign
  , normalizeType = require('./utils').normalizeType
  , normalizeTypes = require('./utils').normalizeTypes
  , setCharset = require('./utils').setCharset
-  , deprecate = require('./utils').deprecate
-  , etag = require('./utils').etag
  , statusCodes = http.STATUS_CODES
  , cookie = require('cookie')
  , send = require('send')
@@ -102,13 +105,15 @@ res.send = function(body){
    }
  }

+  // disambiguate res.send(status) and res.send(status, num)
+  if (typeof body === 'number' && arguments.length === 1) {
+    // res.send(status) will set status message as text string
+    this.get('Content-Type') || this.type('txt');
+    this.statusCode = body;
+    body = http.STATUS_CODES[body];
+  }
+
  switch (typeof body) {
-    // response status
-    case 'number':
-      this.get('Content-Type') || this.type('txt');
-      this.statusCode = body;
-      body = http.STATUS_CODES[body];
-      break;
    // string defaulting to html
    case 'string':
      if (!this.get('Content-Type')) {
@@ -117,6 +122,7 @@ res.send = function(body){
      }
      break;
    case 'boolean':
+    case 'number':
    case 'object':
      if (null == body) {
        body = '';
@@ -128,21 +134,6 @@ res.send = function(body){
      break;
  }

-  // populate Content-Length
-  if (undefined !== body && !this.get('Content-Length')) {
-    this.set('Content-Length', len = Buffer.isBuffer(body)
-      ? body.length
-      : Buffer.byteLength(body));
-  }
-
-  // ETag support
-  // TODO: W/ support
-  if (app.settings.etag && len && 'GET' == req.method) {
-    if (!this.get('ETag')) {
-      this.set('ETag', etag(body));
-    }
-  }
-
  // write strings in utf-8
  if ('string' === typeof body) {
    encoding = 'utf8';
@@ -154,6 +145,23 @@ res.send = function(body){
    }
  }

+  // populate Content-Length
+  if (undefined !== body && !this.get('Content-Length')) {
+    len = Buffer.isBuffer(body)
+      ? body.length
+      : Buffer.byteLength(body, encoding);
+    this.set('Content-Length', len);
+  }
+
+  // ETag support
+  var etag = len !== undefined && app.get('etag fn');
+  if (etag && ('GET' === req.method || 'HEAD' === req.method)) {
+    if (!this.get('ETag')) {
+      etag = etag(body, encoding);
+      etag && this.set('ETag', etag);
+    }
+  }
+
  // freshness
  if (req.fresh) this.statusCode = 304;

@@ -193,9 +201,11 @@ res.json = function(obj){
    // res.json(body, status) backwards compat
    if ('number' == typeof arguments[1]) {
      this.statusCode = arguments[1];
-      return 'number' === typeof obj
-        ? jsonNumDeprecated.call(this, obj)
-        : jsonDeprecated.call(this, obj);
+      if (typeof obj === 'number') {
+        deprecate('res.json(obj, status): Use res.json(status, obj) instead');
+      } else {
+        deprecate('res.json(num, status): Use res.status(status).json(num) instead');
+      }
    } else {
      this.statusCode = obj;
      obj = arguments[1];
@@ -215,12 +225,6 @@ res.json = function(obj){
  return this.send(body);
 };

-var jsonDeprecated = deprecate(res.json,
-  'res.json(obj, status): Use res.json(status, obj) instead');
-
-var jsonNumDeprecated = deprecate(res.json,
-  'res.json(num, status): Use res.status(status).json(num) instead');
-
 /**
 * Send JSON response with JSONP callback support.
 *
@@ -243,9 +247,11 @@ res.jsonp = function(obj){
    // res.json(body, status) backwards compat
    if ('number' == typeof arguments[1]) {
      this.statusCode = arguments[1];
-      return 'number' === typeof obj
-        ? jsonpNumDeprecated.call(this, obj)
-        : jsonpDeprecated.call(this, obj);
+      if (typeof obj === 'number') {
+        deprecate('res.jsonp(obj, status): Use res.jsonp(status, obj) instead');
+      } else {
+        deprecate('res.jsonp(num, status): Use res.status(status).jsonp(num) instead');
+      }
    } else {
      this.statusCode = obj;
      obj = arguments[1];
@@ -256,14 +262,15 @@ res.jsonp = function(obj){
  var app = this.app;
  var replacer = app.get('json replacer');
  var spaces = app.get('json spaces');
-  var body = JSON.stringify(obj, replacer, spaces)
-    .replace(/\u2028/g, '\\u2028')
-    .replace(/\u2029/g, '\\u2029');
+  var body = JSON.stringify(obj, replacer, spaces);
  var callback = this.req.query[app.get('jsonp callback name')];

  // content-type
-  this.charset = this.charset || 'utf-8';
-  this.get('Content-Type') || this.set('Content-Type', 'application/json');
+  if (!this.get('Content-Type')) {
+    this.charset = 'utf-8';
+    this.set('X-Content-Type-Options', 'nosniff');
+    this.set('Content-Type', 'application/json');
+  }

  // fixup callback
  if (Array.isArray(callback)) {
@@ -271,21 +278,27 @@ res.jsonp = function(obj){
  }

  // jsonp
-  if (callback && 'string' === typeof callback) {
+  if (typeof callback === 'string' && callback.length !== 0) {
+    this.charset = 'utf-8';
+    this.set('X-Content-Type-Options', 'nosniff');
    this.set('Content-Type', 'text/javascript');
-    var cb = callback.replace(/[^\[\]\w$.]/g, '');
-    body = 'typeof ' + cb + ' === \'function\' && ' + cb + '(' + body + ');';
+
+    // restrict callback charset
+    callback = callback.replace(/[^\[\]\w$.]/g, '');
+
+    // replace chars not allowed in JavaScript that are in JSON
+    body = body
+      .replace(/\u2028/g, '\\u2028')
+      .replace(/\u2029/g, '\\u2029');
+
+    // the /**/ is a specific security mitigation for "Rosetta Flash JSONP abuse"
+    // the typeof check is just to reduce client error noise
+    body = '/**/ typeof ' + callback + ' === \'function\' && ' + callback + '(' + body + ');';
  }

  return this.send(body);
 };

-var jsonpDeprecated = deprecate(res.json,
-  'res.jsonp(obj, status): Use res.jsonp(status, obj) instead');
-
-var jsonpNumDeprecated = deprecate(res.json,
-  'res.jsonp(num, status): Use res.status(status).jsonp(num) instead');
-
 /**
 * Transfer the file at the given `path`.
 *
@@ -297,8 +310,11 @@ var jsonpNumDeprecated = deprecate(res.json,
 *
 * 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:
 *
@@ -374,9 +390,7 @@ res.sendfile = function(path, options, fn){
  }

  // transfer
-  var file = send(req, path);
-  if (options.root) file.root(options.root);
-  file.maxage(options.maxAge || 0);
+  var file = send(req, path, options);
  file.on('error', error);
  file.on('directory', next);
  file.on('stream', stream);
@@ -400,15 +414,17 @@ res.sendfile = function(path, options, fn){
 * @api public
 */

-res.download = function(path, filename, fn){
+res.download = function download(path, filename, fn) {
  // support function as second arg
-  if ('function' == typeof filename) {
+  if (typeof filename === 'function') {
    fn = filename;
    filename = null;
  }

  filename = filename || path;
-  this.set('Content-Disposition', 'attachment; filename="' + basename(filename) + '"');
+
+  this.set('Content-Disposition', contentDisposition(filename));
+
  return this.sendfile(path, fn);
 };

@@ -531,11 +547,13 @@ res.format = function(obj){
 * @api public
 */

-res.attachment = function(filename){
-  if (filename) this.type(extname(filename));
-  this.set('Content-Disposition', filename
-    ? 'attachment; filename="' + basename(filename) + '"'
-    : 'attachment');
+res.attachment = function attachment(filename) {
+  if (filename) {
+    this.type(extname(filename));
+  }
+
+  this.set('Content-Disposition', contentDisposition(filename));
+
  return this;
 };

@@ -595,7 +613,7 @@ res.get = function(field){
 res.clearCookie = function(name, options){
  var opts = { expires: new Date(1), path: '/' };
  return this.cookie(name, '', options
-    ? utils.merge(opts, options)
+    ? merge(opts, options)
    : opts);
 };

@@ -623,7 +641,7 @@ res.clearCookie = function(name, options){
 */

 res.cookie = function(name, val, options){
-  options = utils.merge({}, options);
+  options = merge({}, options);
  var secret = this.req.secret;
  var signed = options.signed;
  if (signed && !secret) throw new Error('connect.cookieParser("secret") required for signed cookies');
@@ -681,7 +699,7 @@ res.location = function(url){
  if (!~url.indexOf('://') && 0 != url.indexOf('//')) {
    // relative to path
    if ('.' == url[0]) {
-      path = req.originalUrl.split('?')[0];
+      path = parseUrl.original(req).pathname;
      path = path + ('/' == path[path.length - 1] ? '' : '/');
      url = resolve(path, url);
      // relative to mount-point
@@ -709,11 +727,8 @@ res.location = function(url){
 *    res.redirect('/foo/bar');
 *    res.redirect('http://example.com');
 *    res.redirect(301, 'http://example.com');
- *    res.redirect('http://example.com', 301);
 *    res.redirect('../login'); // /blog/post/1 -> /blog/login
 *
- * @param {String} url
- * @param {Number} code
 * @api public
 */

@@ -728,6 +743,7 @@ res.redirect = function(url){
      status = url;
      url = arguments[1];
    } else {
+      deprecate('res.redirect(url, status): Use res.redirect(status, url) instead');
      status = arguments[1];
    }
  }
@@ -743,7 +759,7 @@ res.redirect = function(url){
    },

    html: function(){
-      var u = utils.escape(url);
+      var u = escapeHtml(url);
      body = '<p>' + statusCodes[status] + '. Redirecting to <a href="' + u + '">' + u + '</a></p>';
    },

@@ -768,31 +784,12 @@ res.redirect = function(url){
 */

 res.vary = function(field){
-  var self = this;
-
-  // nothing
+  // checks for back-compat
  if (!field) return this;
+  if (Array.isArray(field) && !field.length) return this;

-  // array
-  if (Array.isArray(field)) {
-    field.forEach(function(field){
-      self.vary(field);
-    });
-    return;
-  }
+  vary(this, field);

-  var vary = this.get('Vary');
-
-  // append
-  if (vary) {
-    vary = vary.split(/ *, */);
-    if (!~vary.indexOf(field)) vary.push(field);
-    this.set('Vary', vary.join(', '));
-    return this;
-  }
-
-  // set
-  this.set('Vary', field);
  return this;
 };

--- a/lib/utils.js
+++ b/lib/utils.js
@@ -3,10 +3,10 @@
 * Module dependencies.
 */

-var mime = require('connect').mime
-  , deprecate = require('util').deprecate
-  , proxyaddr = require('proxy-addr')
-  , crc32 = require('buffer-crc32');
+var etag = require('etag');
+var mime = require('connect').mime;
+var proxyaddr = require('proxy-addr');
+var typer = require('media-typer');

 /**
 * toString ref.
@@ -15,44 +15,37 @@ var mime = require('connect').mime
 var toString = {}.toString;

 /**
- * Simple detection of charset parameter in content-type
- */
-var charsetRegExp = /;\s*charset\s*=/;
-
-/**
- * Deprecate function, like core `util.deprecate`,
- * but with NODE_ENV and color support.
- *
- * @param {Function} fn
- * @param {String} msg
- * @return {Function}
- * @api private
- */
-
-exports.deprecate = function(fn, msg){
-  if (process.env.NODE_ENV === 'test') return fn;
-
-  // prepend module name
-  msg = 'express: ' + msg;
-
-  if (process.stderr.isTTY) {
-    // colorize
-    msg = '\x1b[31;1m' + msg + '\x1b[0m';
-  }
-
-  return deprecate(fn, msg);
-};
-
-/**
- * Return ETag for `body`.
+ * Return strong ETag for `body`.
 *
 * @param {String|Buffer} body
+ * @param {String} [encoding]
 * @return {String}
 * @api private
 */

-exports.etag = function(body){
-  return '"' + crc32.signed(body) + '"';
+exports.etag = function (body, encoding) {
+  var buf = !Buffer.isBuffer(body)
+    ? new Buffer(body, encoding)
+    : body;
+
+  return etag(buf, {weak: false});
+};
+
+/**
+ * Return weak ETag for `body`.
+ *
+ * @param {String|Buffer} body
+ * @param {String} [encoding]
+ * @return {String}
+ * @api private
+ */
+
+exports.wetag = function wetag(body, encoding){
+  var buf = !Buffer.isBuffer(body)
+    ? new Buffer(body, encoding)
+    : body;
+
+  return etag(buf, {weak: true});
 };

 /**
@@ -289,22 +282,6 @@ function acceptParams(str, index) {
  return ret;
 }

-/**
- * Escape special characters in the given string of html.
- *
- * @param  {String} html
- * @return {String}
- * @api private
- */
-
-exports.escape = function(html) {
-  return String(html)
-    .replace(/&/g, '&amp;')
-    .replace(/"/g, '&quot;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
-};
-
 /**
 * Normalize the given path string,
 * returning a regular expression.
@@ -344,6 +321,40 @@ exports.pathRegexp = function(path, keys, sensitive, strict) {
  return new RegExp('^' + path + '$', sensitive ? '' : 'i');
 }

+/**
+ * Compile "etag" value to function.
+ *
+ * @param  {Boolean|String|Function} val
+ * @return {Function}
+ * @api private
+ */
+
+exports.compileETag = function(val) {
+  var fn;
+
+  if (typeof val === 'function') {
+    return val;
+  }
+
+  switch (val) {
+    case true:
+      fn = exports.wetag;
+      break;
+    case false:
+      break;
+    case 'strong':
+      fn = exports.etag;
+      break;
+    case 'weak':
+      fn = exports.wetag;
+      break;
+    default:
+      throw new TypeError('unknown value for etag function: ' + val);
+  }
+
+  return fn;
+}
+
 /**
 * Compile "proxy trust" value to function.
 *
@@ -385,21 +396,12 @@ exports.compileTrust = function(val) {
 exports.setCharset = function(type, charset){
  if (!type || !charset) return type;

-  var exists = charsetRegExp.test(type);
+  // parse type
+  var parsed = typer.parse(type);

-  // removing existing charset
-  if (exists) {
-    var parts = type.split(';');
+  // set charset
+  parsed.parameters.charset = charset;

-    for (var i = 1; i < parts.length; i++) {
-      if (charsetRegExp.test(';' + parts[i])) {
-        parts.splice(i, 1);
-        break;
-      }
-    }
-
-    type = parts.join(';');
-  }
-
-  return type + '; charset=' + charset;
+  // format type
+  return typer.format(parsed);
 };
--- a/package.json
+++ b/package.json
@@ -1,38 +1,19 @@
 {
  "name": "express",
  "description": "Sinatra inspired web development framework",
-  "version": "3.8.0",
+  "version": "3.18.4",
  "author": "TJ Holowaychuk <tj@vision-media.ca>",
  "contributors": [
-    {
-      "name": "TJ Holowaychuk",
-      "email": "tj@vision-media.ca"
-    },
-    {
-      "name": "Aaron Heckmann",
-      "email": "aaron.heckmann+github@gmail.com"
-    },
-    {
-      "name": "Ciaran Jessup",
-      "email": "ciaranj@gmail.com"
-    },
-    {
-      "name": "Douglas Christopher Wilson",
-      "email": "doug@somethingdoug.com"
-    },
-    {
-      "name": "Guillermo Rauch",
-      "email": "rauchg@gmail.com"
-    },
-    {
-      "name": "Jonathan Ong",
-      "email": "me@jongleberry.com"
-    },
-    {
-      "name": "Roman Shtylman",
-      "email": "shtylman+expressjs@gmail.com"
-    }
+    "Aaron Heckmann <aaron.heckmann+github@gmail.com>",
+    "Ciaran Jessup <ciaranj@gmail.com>",
+    "Douglas Christopher Wilson <doug@somethingdoug.com>",
+    "Guillermo Rauch <rauchg@gmail.com>",
+    "Jonathan Ong <me@jongleberry.com>",
+    "Roman Shtylman <shtylman+expressjs@gmail.com"
  ],
+  "license": "MIT",
+  "repository": "strongloop/express",
+  "homepage": "http://expressjs.com/",
  "keywords": [
    "express",
    "framework",
@@ -44,35 +25,39 @@
    "app",
    "api"
  ],
-  "repository": "git://github.com/visionmedia/express",
-  "license": "MIT",
  "dependencies": {
-    "connect": "2.17.1",
+    "basic-auth": "1.0.0",
+    "connect": "2.27.4",
+    "content-disposition": "0.5.0",
    "commander": "1.3.2",
-    "methods": "1.0.0",
+    "cookie-signature": "1.0.5",
+    "debug": "~2.1.0",
+    "depd": "~1.0.0",
+    "escape-html": "1.0.1",
+    "etag": "~1.5.1",
+    "fresh": "0.2.4",
+    "media-typer": "0.3.0",
+    "methods": "1.1.0",
    "mkdirp": "0.5.0",
-    "parseurl": "1.0.1",
-    "proxy-addr": "1.0.0",
-    "range-parser": "1.0.0",
+    "parseurl": "~1.3.0",
+    "proxy-addr": "~1.0.4",
+    "range-parser": "~1.0.2",
+    "send": "0.10.1",
+    "utils-merge": "1.0.0",
+    "vary": "~1.0.0",
    "cookie": "0.1.2",
-    "buffer-crc32": "0.2.1",
-    "fresh": "0.2.2",
-    "send": "0.3.0",
-    "cookie-signature": "1.0.3",
-    "merge-descriptors": "0.0.2",
-    "debug": ">= 0.8.0 < 1"
+    "merge-descriptors": "0.0.2"
  },
  "devDependencies": {
-    "ejs": "~0.8.4",
-    "istanbul": "0.2.10",
-    "mocha": "~1.19.0",
-    "should": "~3.3.1",
-    "jade": "~0.30.0",
+    "connect-redis": "~1.5.0",
+    "istanbul": "0.3.2",
+    "mocha": "~2.0.0",
+    "should": "~4.3.0",
+    "supertest": "~0.15.0",
+    "ejs": "~1.0.0",
+    "jade": "~1.7.0",
    "hjs": "~0.0.6",
-    "stylus": "~0.40.0",
-    "connect-redis": "~1.4.5",
-    "marked": "0.2.10",
-    "supertest": "~0.12.1"
+    "marked": "0.3.2"
  },
  "engines": {
    "node": ">= 0.8.0"
@@ -80,10 +65,18 @@
  "bin": {
    "express": "./bin/express"
  },
+  "files": [
+    "LICENSE",
+    "History.md",
+    "Readme.md",
+    "index.js",
+    "bin/",
+    "lib/"
+  ],
  "scripts": {
-    "prepublish": "npm prune",
    "test": "mocha --require test/support/env --reporter dot --check-leaks test/ test/acceptance/",
    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --require test/support/env --reporter dot --check-leaks test/ test/acceptance/",
+    "test-tap": "mocha --require test/support/env --reporter tap --check-leaks test/ test/acceptance/",
    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --require test/support/env --reporter spec --check-leaks test/ test/acceptance/"
  }
 }
--- a/test/acceptance/ejs.js
+++ b/test/acceptance/ejs.js
@@ -7,14 +7,11 @@ describe('ejs', function(){
    it('should respond with html', function(done){
      request(app)
      .get('/')
-      .end(function(err, res){
-        res.should.have.status(200);
-        res.should.have.header('Content-Type', 'text/html; charset=utf-8');
-        res.text.should.include('<li>tobi &lt;tobi@learnboost.com&gt;</li>');
-        res.text.should.include('<li>loki &lt;loki@learnboost.com&gt;</li>');
-        res.text.should.include('<li>jane &lt;jane@learnboost.com&gt;</li>');
-        done();
-      });
+      .expect('Content-Type', 'text/html; charset=utf-8')
+      .expect(/<li>tobi &lt;tobi@learnboost\.com&gt;<\/li>/)
+      .expect(/<li>loki &lt;loki@learnboost\.com&gt;<\/li>/)
+      .expect(/<li>jane &lt;jane@learnboost\.com&gt;<\/li>/)
+      .expect(200, done)
    })
  })
-})
+})
--- a/test/acceptance/markdown.js
+++ b/test/acceptance/markdown.js
@@ -1,6 +1,6 @@

 var app = require('../../examples/markdown')
-  , request = require('supertest');
+var request = require('supertest')

 describe('markdown', function(){
  describe('GET /', function(){
@@ -18,4 +18,4 @@ describe('markdown', function(){
        .expect(500,done)
    })
  })
-})
+})
--- a/test/acceptance/mvc.js
+++ b/test/acceptance/mvc.js
@@ -33,6 +33,7 @@ describe('mvc', function(){
    it('should update the pet', function(done){
      request(app)
      .put('/pet/3')
+      .set('Content-Type', 'application/x-www-form-urlencoded')
      .send({ pet: { name: 'Boots' } })
      .end(function(err, res){
        if (err) return done(err);
@@ -47,13 +48,11 @@ describe('mvc', function(){
    it('should display a list of users', function(done){
      request(app)
      .get('/users')
-      .end(function(err, res){
-        res.text.should.include('<h1>Users</h1>');
-        res.text.should.include('>TJ<');
-        res.text.should.include('>Guillermo<');
-        res.text.should.include('>Nathan<');
-        done();
-      })
+      .expect(/<h1>Users<\/h1>/)
+      .expect(/>TJ</)
+      .expect(/>Guillermo</)
+      .expect(/>Nathan</)
+      .expect(200, done)
    })
  })

@@ -62,21 +61,16 @@ describe('mvc', function(){
      it('should display the user', function(done){
        request(app)
        .get('/user/0')
-        .end(function(err, res){
-          res.text.should.include('<h1>TJ <a href="/user/0/edit">edit');
-          done();
-        })
+        .expect(200, /<h1>TJ <a href="\/user\/0\/edit">edit/, done)
      })

      it('should display the users pets', function(done){
        request(app)
        .get('/user/0')
-        .end(function(err, res){
-          res.text.should.include('/pet/0">Tobi');
-          res.text.should.include('/pet/1">Loki');
-          res.text.should.include('/pet/2">Jane');
-          done();
-        })
+        .expect(/\/pet\/0">Tobi/)
+        .expect(/\/pet\/1">Loki/)
+        .expect(/\/pet\/2">Jane/)
+        .expect(200, done)
      })
    })

@@ -102,6 +96,7 @@ describe('mvc', function(){
    it('should update the user', function(done){
      request(app)
      .put('/user/1')
+      .set('Content-Type', 'application/x-www-form-urlencoded')
      .send({ user: { name: 'Tobo' }})
      .end(function(err, res){
        if (err) return done(err);
@@ -116,6 +111,7 @@ describe('mvc', function(){
    it('should create a pet for user', function(done){
      request(app)
      .post('/user/2/pet')
+      .set('Content-Type', 'application/x-www-form-urlencoded')
      .send({ pet: { name: 'Snickers' }})
      .expect('Location', '/user/2')
      .expect(302, function(err, res){
--- a/test/acceptance/params.js
+++ b/test/acceptance/params.js
@@ -1,5 +1,5 @@
 var app = require('../../examples/params/app')
-  , request = require('supertest');
+var request = require('supertest')

 describe('params', function(){
  describe('GET /', function(){
@@ -18,6 +18,14 @@ describe('params', function(){
    })
  })

+  describe('GET /user/9', function(){
+    it('should fail to find user', function(done){
+      request(app)
+        .get('/user/9')
+        .expect(/failed to find user/,done)
+    })
+  })
+
  describe('GET /users/0-2', function(){
    it('should respond with three users', function(done){
      request(app)
@@ -25,4 +33,12 @@ describe('params', function(){
        .expect(/users tj, tobi/,done)
    })
  })
-})
+
+  describe('GET /users/foo-bar', function(){
+    it('should fail integer parsing', function(done){
+      request(app)
+        .get('/users/foo-bar')
+        .expect(/failed to parseInt foo/,done)
+    })
+  })
+})
--- a/test/acceptance/resource.js
+++ b/test/acceptance/resource.js
@@ -1,5 +1,5 @@
 var app = require('../../examples/resource/app')
-  , request = require('supertest');
+var request = require('supertest')

 describe('resource', function(){
  describe('GET /', function(){
@@ -26,6 +26,14 @@ describe('resource', function(){
    })
  })

+  describe('GET /users/9', function(){
+    it('should respond with error', function(done){
+      request(app)
+        .get('/users/9')
+        .expect('{"error":"Cannot find user"}', done)
+    })
+  })
+
  describe('GET /users/1..3', function(){
    it('should respond with users 1 through 3', function(done){
      request(app)
@@ -35,13 +43,21 @@ describe('resource', function(){
  })

  describe('DELETE /users/1', function(){
-    it('should respond with users 1 through 3', function(done){
+    it('should delete user 1', function(done){
      request(app)
        .del('/users/1')
        .expect(/^destroyed/,done)
    })
  })

+  describe('DELETE /users/9', function(){
+    it('should fail', function(done){
+      request(app)
+        .del('/users/9')
+        .expect('Cannot find user', done)
+    })
+  })
+
  describe('GET /users/1..3.json', function(){
    it('should respond with users 2 and 3 as json', function(done){
      request(app)
@@ -49,4 +65,4 @@ describe('resource', function(){
        .expect(/^\[null,{"name":"aaron"},{"name":"guillermo"}\]/,done)
    })
  })
-})
+})
--- a/test/acceptance/web-service.js
+++ b/test/acceptance/web-service.js
@@ -53,7 +53,7 @@ describe('web-service', function(){
        .get('/api/repos?api-key=foo')
        .expect('Content-Type', 'application/json; charset=utf-8')
        .expect(/"name":"express"/)
-        .expect(/"url":"http:\/\/github.com\/visionmedia\/express"/)
+        .expect(/"url":"http:\/\/github.com\/strongloop\/express"/)
        .expect(200, done)
      })
    })
@@ -98,12 +98,8 @@ describe('web-service', function(){
    it('should respond with 404 json', function(done){
      request(app)
      .get('/api/something?api-key=bar')
-      .end(function(err, res){
-        res.should.have.status(404);
-        res.should.be.json;
-        res.text.should.equal('{"error":"Lame, can\'t find that"}');
-        done();
-      });
+      .expect('Content-Type', /json/)
+      .expect(404, '{"error":"Lame, can\'t find that"}', done)
    })
  })
 })
--- a/test/app.head.js
+++ b/test/app.head.js
@@ -16,6 +16,31 @@ describe('HEAD', function(){
    .head('/tobi')
    .expect(200, done);
  })
+
+  it('should output the same headers as GET requests', function(done){
+    var app = express();
+
+    app.get('/tobi', function(req, res){
+      // send() detects HEAD
+      res.send('tobi');
+    });
+
+    request(app)
+    .get('/tobi')
+    .expect(200, function(err, res){
+      if (err) return done(err);
+      var headers = res.headers;
+      request(app)
+      .get('/tobi')
+      .expect(200, function(err, res){
+        if (err) return done(err);
+        delete headers.date;
+        delete res.headers.date;
+        assert.deepEqual(res.headers, headers);
+        done();
+      });
+    });
+  })
 })

 describe('app.head()', function(){
--- a/test/app.param.js
+++ b/test/app.param.js
@@ -101,6 +101,24 @@ describe('app', function(){
      .expect('123', done);
    })

+    it('should work with encoded values', function(done){
+      var app = express();
+
+      app.param('name', function(req, res, next, name){
+        req.params.name = name;
+        next();
+      });
+
+      app.get('/user/:name', function(req, res){
+        var name = req.params.name;
+        res.send('' + name);
+      });
+
+      request(app)
+      .get('/user/foo%25bar')
+      .expect('foo%bar', done);
+    })
+
    it('should catch thrown error', function(done){
      var app = express();

--- a/test/app.render.js
+++ b/test/app.render.js
@@ -95,7 +95,7 @@ describe('app', function(){
        app.render('user.jade', function(err, str){
          // nextTick to prevent cyclic
          process.nextTick(function(){
-            err.message.should.match(/user is not defined/);
+            err.message.should.match(/Cannot read property 'name' of undefined/);
            done();
          });
        })
--- a/test/app.router.js
+++ b/test/app.router.js
@@ -564,6 +564,30 @@ describe('app.router', function(){
    })
  })

+  describe('when next("route") is called', function(){
+    it('should jump to next route', function(done){
+      var app = express()
+
+      function fn(req, res, next){
+        res.set('X-Hit', '1')
+        next('route')
+      }
+
+      app.get('/foo', fn, function(req, res, next){
+        res.end('failure')
+      });
+
+      app.get('/foo', function(req, res){
+        res.end('success')
+      })
+
+      request(app)
+      .get('/foo')
+      .expect('X-Hit', '1')
+      .expect(200, 'success', done)
+    })
+  })
+
  describe('when next(err) is called', function(){
    it('should break out of app.router', function(done){
      var app = express()
--- a/test/config.js
+++ b/test/config.js
@@ -13,6 +13,29 @@ describe('config', function(){
      var app = express();
      app.set('foo', undefined).should.equal(app);
    })
+
+    describe('"etag"', function(){
+      it('should throw on bad value', function(){
+        var app = express()
+        app.set.bind(app, 'etag', 42).should.throw(/unknown value/)
+      })
+
+      it('should set "etag fn"', function(){
+        var app = express()
+        var fn = function(){}
+        app.set('etag', fn)
+        app.get('etag fn').should.equal(fn)
+      })
+    })
+
+    describe('"trust proxy"', function(){
+      it('should set "trust proxy fn"', function(){
+        var app = express()
+        var fn = function(){}
+        app.set('trust proxy', fn)
+        app.get('trust proxy fn').should.equal(fn)
+      })
+    })
  })

  describe('.get()', function(){
@@ -91,4 +114,4 @@ describe('config', function(){
      app.disabled('foo').should.be.false;
    })
  })
-})
+})
--- a/test/fixtures/.name
+++ b/test/fixtures/.name
@@ -0,0 +1 @@
+tobi
--- a/test/fixtures/blog/index.html
+++ b/test/fixtures/blog/index.html
@@ -0,0 +1 @@
+<b>index</b>
--- a/test/req.fresh.js
+++ b/test/req.fresh.js
@@ -6,15 +6,16 @@ describe('req', function(){
  describe('.fresh', function(){
    it('should return true when the resource is not modified', function(done){
      var app = express();
+      var etag = '"12345"';

      app.use(function(req, res){
-        res.set('ETag', '12345');
+        res.set('ETag', etag);
        res.send(req.fresh);
      });

      request(app)
      .get('/')
-      .set('If-None-Match', '12345')
+      .set('If-None-Match', etag)
      .expect(304, done);
    })

@@ -22,14 +23,14 @@ describe('req', function(){
      var app = express();

      app.use(function(req, res){
-        res.set('ETag', '123');
+        res.set('ETag', '"123"');
        res.send(req.fresh);
      });

      request(app)
      .get('/')
-      .set('If-None-Match', '12345')
-      .expect('false', done);
+      .set('If-None-Match', '"12345"')
+      .expect(200, 'false', done);
    })
  })
 })
--- a/test/req.ip.js
+++ b/test/req.ip.js
@@ -45,10 +45,9 @@ describe('req', function(){
            res.send(req.ip);
          });

-          request(app)
-          .get('/')
-          .set('X-Forwarded-For', 'client, p1, p2')
-          .expect('127.0.0.1', done);
+          var test = request(app).get('/')
+          test.set('X-Forwarded-For', 'client, p1, p2')
+          test.expect(200, getExpectedClientAddress(test._server), done);
        })
      })
    })
@@ -63,10 +62,19 @@ describe('req', function(){
          res.send(req.ip);
        });

-        request(app)
-        .get('/')
-        .expect('127.0.0.1', done);
+          var test = request(app).get('/')
+          test.expect(200, getExpectedClientAddress(test._server), done);
      })
    })
  })
 })
+
+/**
+ * Get the local client address depending on AF_NET of server
+ */
+
+function getExpectedClientAddress(server) {
+  return server.address().address === '::'
+    ? '::ffff:127.0.0.1'
+    : '127.0.0.1';
+}
--- a/test/req.protocol.js
+++ b/test/req.protocol.js
@@ -32,6 +32,21 @@ describe('req', function(){
        .expect('https', done);
      })

+      it('should default to the socket addr if X-Forwarded-Proto not present', function(done){
+        var app = express();
+
+        app.enable('trust proxy');
+
+        app.use(function(req, res){
+          req.connection.encrypted = true;
+          res.end(req.protocol);
+        });
+
+        request(app)
+        .get('/')
+        .expect('https', done);
+      })
+
      it('should ignore X-Forwarded-Proto if socket addr not trusted', function(done){
        var app = express();

--- a/test/req.stale.js
+++ b/test/req.stale.js
@@ -6,15 +6,16 @@ describe('req', function(){
  describe('.stale', function(){
    it('should return false when the resource is not modified', function(done){
      var app = express();
+      var etag = '"12345"';

      app.use(function(req, res){
-        res.set('ETag', '12345');
+        res.set('ETag', etag);
        res.send(req.stale);
      });

      request(app)
      .get('/')
-      .set('If-None-Match', '12345')
+      .set('If-None-Match', etag)
      .expect(304, done);
    })

@@ -22,14 +23,14 @@ describe('req', function(){
      var app = express();

      app.use(function(req, res){
-        res.set('ETag', '123');
+        res.set('ETag', '"123"');
        res.send(req.stale);
      });

      request(app)
      .get('/')
-      .set('If-None-Match', '12345')
-      .expect('true', done);
+      .set('If-None-Match', '"12345"')
+      .expect(200, 'true', done);
    })
  })
 })
--- a/test/req.subdomains.js
+++ b/test/req.subdomains.js
@@ -15,7 +15,33 @@ describe('req', function(){
        request(app)
        .get('/')
        .set('Host', 'tobi.ferrets.example.com')
-        .expect(["ferrets","tobi"], done);
+        .expect(200, ['ferrets', 'tobi'], done);
+      })
+
+      it('should work with IPv4 address', function(done){
+        var app = express();
+
+        app.use(function(req, res){
+          res.send(req.subdomains);
+        });
+
+        request(app)
+        .get('/')
+        .set('Host', '127.0.0.1')
+        .expect(200, [], done);
+      })
+
+      it('should work with IPv6 address', function(done){
+        var app = express();
+
+        app.use(function(req, res){
+          res.send(req.subdomains);
+        });
+
+        request(app)
+        .get('/')
+        .set('Host', '[::1]')
+        .expect(200, [], done);
      })
    })

@@ -30,7 +56,7 @@ describe('req', function(){
        request(app)
        .get('/')
        .set('Host', 'example.com')
-        .expect([], done);
+        .expect(200, [], done);
      })
    })

@@ -45,7 +71,23 @@ describe('req', function(){

        request(app)
        .get('/')
-        .expect([], done);
+        .expect(200, [], done);
+      })
+    })
+
+    describe('with trusted X-Forwarded-Host', function () {
+      it('should return an array', function (done) {
+        var app = express();
+
+        app.set('trust proxy', true);
+        app.use(function (req, res) {
+          res.send(req.subdomains);
+        });
+
+        request(app)
+        .get('/')
+        .set('X-Forwarded-Host', 'tobi.ferrets.example.com')
+        .expect(200, ['ferrets', 'tobi'], done);
      })
    })

@@ -62,7 +104,35 @@ describe('req', function(){
          request(app)
          .get('/')
          .set('Host', 'tobi.ferrets.sub.example.com')
-          .expect(["com","example","sub","ferrets","tobi"], done);
+          .expect(200, ['com', 'example', 'sub', 'ferrets', 'tobi'], done);
+        })
+
+        it('should return an array with the whole IPv4', function (done) {
+          var app = express();
+          app.set('subdomain offset', 0);
+
+          app.use(function(req, res){
+            res.send(req.subdomains);
+          });
+
+          request(app)
+          .get('/')
+          .set('Host', '127.0.0.1')
+          .expect(200, ['127.0.0.1'], done);
+        })
+
+        it('should return an array with the whole IPv6', function (done) {
+          var app = express();
+          app.set('subdomain offset', 0);
+
+          app.use(function(req, res){
+            res.send(req.subdomains);
+          });
+
+          request(app)
+          .get('/')
+          .set('Host', '[::1]')
+          .expect(200, ['[::1]'], done);
        })
      })

@@ -78,7 +148,7 @@ describe('req', function(){
          request(app)
          .get('/')
          .set('Host', 'tobi.ferrets.sub.example.com')
-          .expect(["ferrets","tobi"], done);
+          .expect(200, ['ferrets', 'tobi'], done);
        })
      })

@@ -94,7 +164,7 @@ describe('req', function(){
          request(app)
          .get('/')
          .set('Host', 'sub.example.com')
-          .expect([], done);
+          .expect(200, [], done);
        })
      })
    })
--- a/test/res.cookie.js
+++ b/test/res.cookie.js
@@ -1,8 +1,8 @@

 var express = require('../')
  , request = require('supertest')
-  , utils = require('connect').utils
  , cookie = require('cookie');
+var merge = require('utils-merge');

 describe('res', function(){
  describe('.cookie(name, object)', function(){
@@ -89,7 +89,7 @@ describe('res', function(){
        request(app)
        .get('/')
        .end(function(err, res){
-          res.headers['set-cookie'][0].should.not.include('Thu, 01 Jan 1970 00:00:01 GMT');
+          res.headers['set-cookie'][0].should.not.containEql('Thu, 01 Jan 1970 00:00:01 GMT');
          done();
        })
      })
@@ -104,17 +104,14 @@ describe('res', function(){

        request(app)
        .get('/')
-        .end(function(err, res){
-          res.headers['set-cookie'][0].should.include('Max-Age=1');
-          done();
-        })
+        .expect('Set-Cookie', /Max-Age=1/, done)
      })

      it('should not mutate the options object', function(done){
        var app = express();

        var options = { maxAge: 1000 };
-        var optionsCopy = utils.merge({}, options);
+        var optionsCopy = merge({}, options);

        app.use(function(req, res){
          res.cookie('name', 'tobi', options)
--- a/test/res.download.js
+++ b/test/res.download.js
@@ -14,12 +14,9 @@ describe('res', function(){

      request(app)
      .get('/')
-      .end(function(err, res){
-        res.should.have.header('Content-Type', 'text/html; charset=UTF-8');
-        res.should.have.header('Content-Disposition', 'attachment; filename="user.html"');
-        res.text.should.equal('<p>{{user.name}}</p>');
-        done();
-      });
+      .expect('Content-Type', 'text/html; charset=UTF-8')
+      .expect('Content-Disposition', 'attachment; filename="user.html"')
+      .expect(200, '<p>{{user.name}}</p>', done)
    })
  })

@@ -33,11 +30,9 @@ describe('res', function(){

      request(app)
      .get('/')
-      .end(function(err, res){
-        res.should.have.header('Content-Type', 'text/html; charset=UTF-8');
-        res.should.have.header('Content-Disposition', 'attachment; filename="document"');
-        done();
-      });
+      .expect('Content-Type', 'text/html; charset=UTF-8')
+      .expect('Content-Disposition', 'attachment; filename="document"')
+      .expect(200, done)
    })
  })

@@ -52,10 +47,11 @@ describe('res', function(){

      request(app)
      .get('/')
-      .end(function(err, res){
-        res.should.have.header('Content-Type', 'text/html; charset=UTF-8');
-        res.should.have.header('Content-Disposition', 'attachment; filename="user.html"');
-      });
+      .expect('Content-Type', 'text/html; charset=UTF-8')
+      .expect('Content-Disposition', 'attachment; filename="user.html"')
+      .expect(200, function(err){
+        assert.ifError(err)
+      })
    })
  })

@@ -70,10 +66,11 @@ describe('res', function(){

      request(app)
      .get('/')
-      .end(function(err, res){
-        res.should.have.header('Content-Type', 'text/html; charset=UTF-8');
-        res.should.have.header('Content-Disposition', 'attachment; filename="document"');
-      });
+      .expect('Content-Type', 'text/html; charset=UTF-8')
+      .expect('Content-Disposition', 'attachment; filename="document"')
+      .expect(200, function(err){
+        assert.ifError(err)
+      })
    })
  })

--- a/test/res.jsonp.js
+++ b/test/res.jsonp.js
@@ -14,11 +14,8 @@ describe('res', function(){

      request(app)
      .get('/?callback=something')
-      .end(function(err, res){
-        res.headers.should.have.property('content-type', 'text/javascript; charset=utf-8');
-        res.text.should.equal('typeof something === \'function\' && something({"count":1});');
-        done();
-      })
+      .expect('Content-Type', 'text/javascript; charset=utf-8')
+      .expect(200, /something\(\{"count":1\}\);/, done);
    })

    it('should use first callback parameter with jsonp', function(done){
@@ -29,12 +26,9 @@ describe('res', function(){
      });

      request(app)
-          .get('/?callback=something&callback=somethingelse')
-          .end(function(err, res){
-            res.headers.should.have.property('content-type', 'text/javascript; charset=utf-8');
-            res.text.should.equal('typeof something === \'function\' && something({"count":1});');
-            done();
-          })
+      .get('/?callback=something&callback=somethingelse')
+      .expect('Content-Type', 'text/javascript; charset=utf-8')
+      .expect(200, /something\(\{"count":1\}\);/, done);
    })

    it('should ignore object callback parameter with jsonp', function(done){
@@ -61,11 +55,8 @@ describe('res', function(){

      request(app)
      .get('/?clb=something')
-      .end(function(err, res){
-        res.headers.should.have.property('content-type', 'text/javascript; charset=utf-8');
-        res.text.should.equal('typeof something === \'function\' && something({"count":1});');
-        done();
-      })
+      .expect('Content-Type', 'text/javascript; charset=utf-8')
+      .expect(200, /something\(\{"count":1\}\);/, done);
    })

    it('should allow []', function(done){
@@ -77,11 +68,8 @@ describe('res', function(){

      request(app)
      .get('/?callback=callbacks[123]')
-      .end(function(err, res){
-        res.headers.should.have.property('content-type', 'text/javascript; charset=utf-8');
-        res.text.should.equal('typeof callbacks[123] === \'function\' && callbacks[123]({"count":1});');
-        done();
-      })
+      .expect('Content-Type', 'text/javascript; charset=utf-8')
+      .expect(200, /callbacks\[123\]\(\{"count":1\}\);/, done);
    })

    it('should disallow arbitrary js', function(done){
@@ -93,11 +81,8 @@ describe('res', function(){

      request(app)
      .get('/?callback=foo;bar()')
-      .end(function(err, res){
-        res.headers.should.have.property('content-type', 'text/javascript; charset=utf-8');
-        res.text.should.equal('typeof foobar === \'function\' && foobar({});');
-        done();
-      })
+      .expect('Content-Type', 'text/javascript; charset=utf-8')
+      .expect(200, /foobar\(\{\}\);/, done);
    })

    it('should escape utf whitespace', function(done){
@@ -109,13 +94,37 @@ describe('res', function(){

      request(app)
      .get('/?callback=foo')
-      .end(function(err, res){
-        res.headers.should.have.property('content-type', 'text/javascript; charset=utf-8');
-        res.text.should.equal('typeof foo === \'function\' && foo({"str":"\\u2028 \\u2029 woot"});');
-        done();
-      });
+      .expect('Content-Type', 'text/javascript; charset=utf-8')
+      .expect(200, /foo\(\{"str":"\\u2028 \\u2029 woot"\}\);/, done);
    });

+    it('should not escape utf whitespace for json fallback', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        res.jsonp({ str: '\u2028 \u2029 woot' });
+      });
+
+      request(app)
+      .get('/')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200, '{"str":"\u2028 \u2029 woot"}', done);
+    });
+
+    it('should include security header and prologue', function (done) {
+      var app = express();
+
+      app.use(function(req, res){
+        res.jsonp({ count: 1 });
+      });
+
+      request(app)
+      .get('/?callback=something')
+      .expect('Content-Type', 'text/javascript; charset=utf-8')
+      .expect('X-Content-Type-Options', 'nosniff')
+      .expect(200, /^\/\*\*\//, done);
+    })
+
    it('should not override previous Content-Types with no callback', function(done){
      var app = express();

@@ -127,7 +136,11 @@ describe('res', function(){
      request(app)
      .get('/')
      .expect('Content-Type', 'application/vnd.example+json; charset=utf-8')
-      .expect(200, '{"hello":"world"}', done);
+      .expect(200, '{"hello":"world"}', function (err, res) {
+        if (err) return done(err);
+        res.headers.should.not.have.property('x-content-type-options');
+        done();
+      });
    })

    it('should override previous Content-Types with callback', function(done){
@@ -141,6 +154,7 @@ describe('res', function(){
      request(app)
      .get('/?callback=cb')
      .expect('Content-Type', 'text/javascript; charset=utf-8')
+      .expect('X-Content-Type-Options', 'nosniff')
      .expect(200, /cb\(\{"hello":"world"\}\);$/, done);
    })

--- a/test/res.redirect.js
+++ b/test/res.redirect.js
@@ -13,11 +13,8 @@ describe('res', function(){

      request(app)
      .get('/')
-      .end(function(err, res){
-        res.statusCode.should.equal(302);
-        res.headers.should.have.property('location', 'http://google.com');
-        done();
-      })
+      .expect('location', 'http://google.com')
+      .expect(302, done)
    })
  })

@@ -159,12 +156,11 @@ describe('res', function(){
      request(app)
      .get('/')
      .set('Accept', 'application/octet-stream')
-      .end(function(err, res){
-        res.should.have.status(302);
-        res.headers.should.have.property('location', 'http://google.com');
+      .expect('location', 'http://google.com')
+      .expect('content-length', '0')
+      .expect(302, '', function(err, res){
+        if (err) return done(err)
        res.headers.should.not.have.property('content-type');
-        res.headers.should.have.property('content-length', '0');
-        res.text.should.equal('');
        done();
      })
    })
--- a/test/res.render.js
+++ b/test/res.render.js
@@ -79,7 +79,7 @@ describe('res', function(){

        request(app)
        .get('/')
-        .expect(/user is not defined/, done);
+        .expect(/Cannot read property 'name' of undefined/, done);
      })
    })

@@ -250,7 +250,7 @@ describe('res', function(){

        request(app)
        .get('/')
-        .expect(/is not defined/, done);
+        .expect(/Cannot read property 'name' of undefined/, done);
      })
    })
  })
--- a/test/res.send.js
+++ b/test/res.send.js
@@ -77,6 +77,21 @@ describe('res', function(){
    })
  })

+  describe('.send(code, number)', function(){
+    it('should send number as json', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        res.send(200, 0.123);
+      });
+
+      request(app)
+      .get('/')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200, '0.123', done);
+    })
+  })
+
  describe('.send(String)', function(){
    it('should send as html', function(done){
      var app = express();
@@ -105,7 +120,7 @@ describe('res', function(){

      request(app)
      .get('/')
-      .expect('ETag', '"-1498647312"')
+      .expect('ETag', 'W/"fz/jGo0ONwzb+aKy/rWipg=="')
      .end(done);
    })

@@ -194,7 +209,7 @@ describe('res', function(){

      request(app)
      .get('/')
-      .expect('ETag', '"-1498647312"')
+      .expect('ETag', 'W/"fz/jGo0ONwzb+aKy/rWipg=="')
      .end(done);
    })

@@ -287,15 +302,16 @@ describe('res', function(){

  it('should always check regardless of length', function(done){
    var app = express();
+    var etag = '"asdf"';

    app.use(function(req, res, next){
-      res.set('ETag', 'asdf');
+      res.set('ETag', etag);
      res.send('hey');
    });

    request(app)
    .get('/')
-    .set('If-None-Match', 'asdf')
+    .set('If-None-Match', etag)
    .expect(304, done);
  })

@@ -309,22 +325,23 @@ describe('res', function(){

    request(app)
    .get('/')
-    .set('If-None-Match', '"-1498647312"')
+    .set('If-None-Match', 'W/"fz/jGo0ONwzb+aKy/rWipg=="')
    .expect(304, done);
  })

  it('should not perform freshness check unless 2xx or 304', function(done){
    var app = express();
+    var etag = '"asdf"';

    app.use(function(req, res, next){
      res.status(500);
-      res.set('ETag', 'asdf');
+      res.set('ETag', etag);
      res.send('hey');
    });

    request(app)
    .get('/')
-    .set('If-None-Match', 'asdf')
+    .set('If-None-Match', etag)
    .expect('hey')
    .expect(500, done);
  })
@@ -343,22 +360,35 @@ describe('res', function(){

  describe('"etag" setting', function(){
    describe('when enabled', function(){
-      it('should send ETag even when content-length < 1024', function(done){
+      it('should send ETag', function(done){
        var app = express();

        app.use(function(req, res){
          res.send('kajdslfkasdf');
        });

+        app.enable('etag');
+
        request(app)
        .get('/')
-        .end(function(err, res){
-          res.headers.should.have.property('etag');
-          done();
-        });
+        .expect('etag', 'W/"c-5aee35d8"', done)
      })

-      it('should send ETag ', function(done){
+      it('should send ETag for empty string response', function(done){
+        var app = express()
+
+        app.use(function(req, res){
+          res.send('')
+        });
+
+        app.enable('etag')
+
+        request(app)
+        .get('/')
+        .expect('etag', 'W/"0-0"', done)
+      })
+
+      it('should send ETag for long response', function(done){
        var app = express();

        app.use(function(req, res){
@@ -366,13 +396,44 @@ describe('res', function(){
          res.send(str);
        });

+        app.enable('etag');
+
+        request(app)
+        .get('/')
+        .expect('etag', 'W/"fz/jGo0ONwzb+aKy/rWipg=="', done)
+      });
+
+      it('should not override ETag when manually set', function(done){
+        var app = express();
+
+        app.use(function(req, res){
+          res.set('etag', '"asdf"');
+          res.send(200);
+        });
+
+        app.enable('etag');
+
+        request(app)
+        .get('/')
+        .expect('etag', '"asdf"', done)
+      });
+
+      it('should not send ETag for res.send()', function(done){
+        var app = express()
+
+        app.use(function(req, res){
+          res.send()
+        });
+
+        app.enable('etag')
+
        request(app)
        .get('/')
        .end(function(err, res){
-          res.headers.should.have.property('etag', '"-1498647312"');
+          res.headers.should.not.have.property('etag');
          done();
-        });
-      });
+        })
+      })
    });

    describe('when disabled', function(){
@@ -400,17 +461,85 @@ describe('res', function(){
        app.disable('etag');

        app.use(function(req, res){
-          res.set('etag', 1);
+          res.set('etag', '"asdf"');
          res.send(200);
        });

        request(app)
        .get('/')
-        .end(function(err, res){
-          res.headers.should.have.property('etag');
-          done();
-        });
+        .expect('etag', '"asdf"', done)
      });
    });
+
+    describe('when "strong"', function(){
+      it('should send strong ETag', function(done){
+        var app = express()
+
+        app.set('etag', 'strong');
+
+        app.use(function(req, res){
+          res.send('hello, world!');
+        });
+
+        request(app)
+        .get('/')
+        .expect('etag', '"Otu60XkfuuPskIiUxJY4cA=="', done)
+      })
+    })
+
+    describe('when "weak"', function(){
+      it('should send weak ETag', function(done){
+        var app = express()
+
+        app.set('etag', 'weak');
+
+        app.use(function(req, res){
+          res.send('hello, world!');
+        });
+
+        request(app)
+        .get('/')
+        .expect('etag', 'W/"d-58988d13"', done)
+      })
+    })
+
+    describe('when a function', function(){
+      it('should send custom ETag', function(done){
+        var app = express()
+
+        app.set('etag', function(body, encoding){
+          body.should.equal('hello, world!')
+          encoding.should.equal('utf8')
+          return '"custom"'
+        });
+
+        app.use(function(req, res){
+          res.send('hello, world!');
+        });
+
+        request(app)
+        .get('/')
+        .expect('etag', '"custom"', done)
+      })
+
+      it('should not send falsy ETag', function(done){
+        var app = express()
+
+        app.set('etag', function(body, encoding){
+          return undefined
+        });
+
+        app.use(function(req, res){
+          res.send('hello, world!');
+        });
+
+        request(app)
+        .get('/')
+        .end(function(err, res){
+          res.headers.should.not.have.property('etag')
+          done();
+        })
+      })
+    })
  })
 })
--- a/test/res.sendfile.js
+++ b/test/res.sendfile.js
@@ -9,11 +9,7 @@ describe('res', function(){
      var app = express();

      app.use(function(req, res){
-        res.sendfile('test/fixtures/user.html', function(err){
-          assert(!err);
-          req.socket.listeners('error').should.have.length(1); // node's original handler
-          done();
-        });
+        res.sendfile('test/fixtures/user.html', done)
      });

      request(app)
@@ -110,6 +106,54 @@ 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);
+    })
+
+    it('should transfer a file', function (done) {
+      var app = express();
+
+      app.use(function (req, res) {
+        res.sendfile('test/fixtures/name.txt');
+      });
+
+      request(app)
+      .get('/')
+      .expect(200, 'tobi', done);
+    });
+
+    it('should transfer a directory index file', function (done) {
+      var app = express();
+
+      app.use(function (req, res) {
+        res.sendfile('test/fixtures/blog/');
+      });
+
+      request(app)
+      .get('/')
+      .expect(200, '<b>index</b>', done);
+    });
+
    describe('with an absolute path', function(){
      it('should transfer the file', function(done){
        var app = express();
--- a/test/res.set.js
+++ b/test/res.set.js
@@ -20,8 +20,8 @@ describe('res', function(){

    it('should coerce to a string', function(){
      res.headers = {};
-      res.set('ETag', 123);
-      res.get('ETag').should.equal('123');
+      res.set('X-Number', 123);
+      res.get('X-Number').should.equal('123');
    })
  })

@@ -41,8 +41,9 @@ describe('res', function(){

    it('should coerce to an array of strings', function(){
      res.headers = {};
-      res.set('ETag', [123, 456]);
-      JSON.stringify(res.get('ETag')).should.equal('["123","456"]');
+      res.set('X-Numbers', [123, 456]);
+      JSON.stringify(res.get('X-Numbers'))
+      .should.equal('["123","456"]');
    })
  })

@@ -66,8 +67,8 @@ describe('res', function(){

    it('should coerce to a string', function(){
      res.headers = {};
-      res.set({ ETag: 123 });
-      res.get('ETag').should.equal('123');
+      res.set({ 'X-Number': 123 });
+      res.get('X-Number').should.equal('123');
    })
  })
 })
--- a/test/support/env.js
+++ b/test/support/env.js
@@ -1,2 +1,3 @@

 process.env.NODE_ENV = 'test';
+process.env.NO_DEPRECATION = 'connect,express';
--- a/test/utils.js
+++ b/test/utils.js
@@ -2,24 +2,50 @@
 var utils = require('../lib/utils')
  , assert = require('assert');

-describe('utils.etag(body)', function(){
-
-  var str = 'Hello CRC';
-  var strUTF8 = '<!DOCTYPE html>\n<html>\n<head>\n</head>\n<body><p>自動販売</p></body></html>';
-
+describe('utils.etag(body, encoding)', function(){
  it('should support strings', function(){
-    utils.etag(str).should.eql('"-2034458343"');
+    utils.etag('express!')
+    .should.eql('"zZdv4imtWD49AHEviejT6A=="')
  })

  it('should support utf8 strings', function(){
-    utils.etag(strUTF8).should.eql('"1395090196"');
+    utils.etag('express❤', 'utf8')
+    .should.eql('"fsFba4IxwQS6h6Umb+FNxw=="')
  })

  it('should support buffer', function(){
-    utils.etag(new Buffer(strUTF8)).should.eql('"1395090196"');
-    utils.etag(new Buffer(str)).should.eql('"-2034458343"');
+    var buf = new Buffer('express!')
+    utils.etag(buf)
+    .should.eql('"zZdv4imtWD49AHEviejT6A=="');
  })

+  it('should support empty string', function(){
+    utils.etag('')
+    .should.eql('"1B2M2Y8AsgTpgAmY7PhCfg=="');
+  })
+})
+
+describe('utils.wetag(body, encoding)', function(){
+  it('should support strings', function(){
+    utils.wetag('express!')
+    .should.eql('W/"8-b8aabac7"')
+  })
+
+  it('should support utf8 strings', function(){
+    utils.wetag('express❤', 'utf8')
+    .should.eql('W/"a-686b0af1"')
+  })
+
+  it('should support buffer', function(){
+    var buf = new Buffer('express!')
+    utils.wetag(buf)
+    .should.eql('W/"8-b8aabac7"');
+  })
+
+  it('should support empty string', function(){
+    utils.wetag('')
+    .should.eql('W/"0-0"');
+  })
 })

 describe('utils.isAbsolute()', function(){
@@ -28,7 +54,11 @@ describe('utils.isAbsolute()', function(){
    assert(!utils.isAbsolute(':\\'));
  })

-  it('should unices', function(){
+  it('should support windows unc', function(){
+    assert(utils.isAbsolute('\\\\foo\\bar'))
+  })
+
+  it('should support unices', function(){
    assert(utils.isAbsolute('/foo/bar'));
    assert(!utils.isAbsolute('foo/bar'));
  })
@@ -42,13 +72,6 @@ describe('utils.flatten(arr)', function(){
  })
 })

-describe('utils.escape(html)', function(){
-  it('should escape html entities', function(){
-    utils.escape('<script>foo & "bar"')
-      .should.equal('&lt;script&gt;foo &amp; &quot;bar&quot;')
-  })
-})
-
 describe('utils.parseParams(str)', function(){
  it('should default quality to 1', function(){
    utils.parseParams('text/html')
@@ -218,4 +241,10 @@ describe('utils.accepts(type, str)', function(){
        .should.equal('html');
    })
  })
+
+  describe('when params included', function(){
+    it('should match params', function(){
+      assert(null == utils.accepts('text/html; charset=us-ascii', 'text/html; charset=utf-8'));
+    })
+  })
 })
Author	SHA1	Message	Date
Douglas Christopher Wilson	6c8bcd5c4e	3.18.4	2014-11-23 15:42:03 -05:00
Douglas Christopher Wilson	95e63ec287	deps: should@~4.3.0	2014-11-23 15:36:59 -05:00
Douglas Christopher Wilson	ebca5887cc	deps: proxy-addr@~1.0.4	2014-11-23 15:34:57 -05:00
Douglas Christopher Wilson	8535d3a990	deps: supertest@~0.15.0	2014-11-23 14:58:56 -05:00
Douglas Christopher Wilson	13184c4379	deps: etag@~1.5.1	2014-11-23 14:58:22 -05:00
Douglas Christopher Wilson	eaba4eeb70	deps: connect@2.27.4	2014-11-23 14:53:23 -05:00
Douglas Christopher Wilson	28c6952d1c	3.18.3	2014-11-09 18:35:34 -05:00
Douglas Christopher Wilson	01e3530a31	deps: should@~4.2.1	2014-11-09 18:33:17 -05:00
Douglas Christopher Wilson	77c83d0c57	deps: connect@2.27.3	2014-11-09 18:32:43 -05:00
Douglas Christopher Wilson	a12ae729bd	3.18.2	2014-10-29 01:10:45 -04:00
Douglas Christopher Wilson	d53a0cd91e	deps: connect@2.27.2	2014-10-29 01:08:36 -04:00
Douglas Christopher Wilson	88dfd36eaa	3.18.1	2014-10-23 01:26:21 -04:00
Douglas Christopher Wilson	5759b3e9f5	deps: send@0.10.1	2014-10-23 01:25:07 -04:00
Douglas Christopher Wilson	c939a771c0	deps: connect@2.27.1	2014-10-23 01:23:54 -04:00
Douglas Christopher Wilson	af1043844f	Fix internal utils.merge deprecation warnings	2014-10-22 15:18:10 -04:00
Douglas Christopher Wilson	dd763ec5b8	deps: should@~4.1.0	2014-10-22 15:10:22 -04:00
Douglas Christopher Wilson	9c2c21aaaf	deps: mocha@~2.0.0	2014-10-22 15:08:49 -04:00
Douglas Christopher Wilson	366000184f	3.18.0	2014-10-18 00:57:48 -04:00
Douglas Christopher Wilson	4d1ee23f84	Use etag module to generate ETag headers	2014-10-18 00:53:17 -04:00
Douglas Christopher Wilson	0e5613363f	Use content-disposition module	2014-10-17 21:08:05 -04:00
Fishrock123	7a7f18c20b	build: misc. updates to packaging closes #2398	2014-10-17 20:49:56 -04:00
Douglas Christopher Wilson	b766aad112	deps: jade@~1.7.0	2014-10-17 20:45:57 -04:00
Douglas Christopher Wilson	7488e27609	deps: send@0.10.0	2014-10-17 20:45:09 -04:00
Douglas Christopher Wilson	bc9d854763	deps: depd@~1.0.0	2014-10-17 20:44:07 -04:00
Douglas Christopher Wilson	2e20a85810	deps: debug@~2.1.0	2014-10-17 20:43:23 -04:00
Douglas Christopher Wilson	a706408208	deps: connect@2.27.0	2014-10-17 20:42:12 -04:00
Douglas Christopher Wilson	6d39d0f8a8	3.17.8	2014-10-16 00:29:56 -04:00
Douglas Christopher Wilson	159ea67713	deps: connect@2.26.6	2014-10-16 00:24:28 -04:00
Douglas Christopher Wilson	33959ed350	deps: mocha@~1.21.5	2014-10-16 00:19:47 -04:00
Bessie Chan	be478d348c	Fix typo in res.redirect deprecation closes #2395	2014-10-11 18:11:22 -04:00
Douglas Christopher Wilson	9f292d873e	3.17.7	2014-10-08 17:00:45 -04:00
Douglas Christopher Wilson	ef3e95ca73	deps: supertest@~0.14.0	2014-10-08 16:44:29 -04:00
Douglas Christopher Wilson	f45bd632df	deps: connect@2.26.5	2014-10-08 16:43:02 -04:00
Douglas Christopher Wilson	cc18da5cdf	3.17.6	2014-10-02 23:29:40 -04:00
Douglas Christopher Wilson	5603f86edd	deps: connect@2.26.4	2014-10-02 23:27:41 -04:00
Douglas Christopher Wilson	43e2cd79cb	3.17.5	2014-09-24 19:38:35 -04:00
Douglas Christopher Wilson	653270bb43	deps: send@0.9.3	2014-09-24 19:15:46 -04:00
Douglas Christopher Wilson	734bdf5ca1	deps: proxy-addr@~1.0.3	2014-09-24 19:14:33 -04:00
Douglas Christopher Wilson	341c1919d9	deps: connect@2.26.3	2014-09-24 19:12:43 -04:00
Douglas Christopher Wilson	b09afad7b1	3.17.4	2014-09-19 22:57:07 -07:00
Douglas Christopher Wilson	0e0b259556	deps: connect@2.26.2	2014-09-19 22:54:39 -07:00
Douglas Christopher Wilson	63286e1192	3.17.3	2014-09-18 10:38:31 -07:00
Douglas Christopher Wilson	c00f2f8596	deps: proxy-addr@~1.0.2	2014-09-18 10:36:21 -07:00
Douglas Christopher Wilson	f29399c4e1	3.17.2	2014-09-16 00:14:41 -07:00
Douglas Christopher Wilson	f6ac068ab0	Use crc instead of buffer-crc32 for speed	2014-09-16 00:11:08 -07:00
Douglas Christopher Wilson	7eb65eeca2	deps: send@0.9.2	2014-09-15 23:59:02 -07:00
Douglas Christopher Wilson	178fe15091	deps: depd@0.4.5	2014-09-15 23:57:41 -07:00
Douglas Christopher Wilson	381f278d0a	deps: connect@2.26.1	2014-09-15 23:56:36 -07:00
Douglas Christopher Wilson	534fa181c6	Add test-tap npm script for TAP output closes #2359	2014-09-15 21:41:35 -07:00
Julien Gilli	80847d8c82	tests: fix broken tests with node v0.12 branch Currently, test/req.ip.js assumes that the connection between the client and the server is an IPv4 connection. However, depending on the configuration of the host where this test runs, the connection can be an IPv4 one or an IPv6 one using an IPv4 mapped address. In the future, it could also be a "full" IPv6 connection. This change makes this test handle any type of address. fixes #2342	2014-09-15 21:41:34 -07:00
Douglas Christopher Wilson	4b1b8e420f	3.17.1	2014-09-08 23:45:38 -04:00
Douglas Christopher Wilson	70767b19ac	Fix error in req.subdomains on empty host	2014-09-08 23:45:34 -04:00
Douglas Christopher Wilson	7d277c1c15	docs: remove erroneous from history	2014-09-08 23:44:24 -04:00
Douglas Christopher Wilson	fa1fcd9fec	3.17.0	2014-09-08 23:07:02 -04:00
Douglas Christopher Wilson	2de6514b4b	Support IP address host in req.subdomains fixes #2308	2014-09-08 23:04:06 -04:00
Douglas Christopher Wilson	d07c06363f	Support X-Forwarded-Host in req.subdomains	2014-09-08 23:02:42 -04:00
Douglas Christopher Wilson	4e97533fd2	deps: jade@~1.6.0	2014-09-08 22:48:47 -04:00
Douglas Christopher Wilson	d7d6219a1e	deps: range-parser@~1.0.2	2014-09-08 22:47:54 -04:00
Douglas Christopher Wilson	9b18461bbc	deps: vary@~1.0.0	2014-09-08 21:18:28 -04:00
Douglas Christopher Wilson	b77aa38c98	deps: cookie-signature@1.0.5	2014-09-08 21:17:03 -04:00
Douglas Christopher Wilson	cbb251377e	deps: fresh@0.2.4	2014-09-08 21:14:27 -04:00
Douglas Christopher Wilson	d6ed469de3	deps: send@0.9.1	2014-09-08 21:13:20 -04:00
Douglas Christopher Wilson	49284c236b	deps: debug@~2.0.0	2014-09-08 21:11:41 -04:00
Douglas Christopher Wilson	be18487f7d	deps: media-typer@0.3.0	2014-09-08 21:10:57 -04:00
Douglas Christopher Wilson	094ff11949	deps: connect@2.26.0	2014-09-08 21:09:22 -04:00
Douglas Christopher Wilson	b97f6eb506	examples: fix github view example closes #2344	2014-09-08 19:31:58 -04:00
Douglas Christopher Wilson	3d188fe13e	3.16.10	2014-09-05 02:17:55 -04:00
Douglas Christopher Wilson	8327708ec2	deps: istanbul@0.3.2	2014-09-05 01:57:02 -04:00
Douglas Christopher Wilson	c8640b3465	deps: send@0.8.5	2014-09-05 01:56:27 -04:00
Douglas Christopher Wilson	3ce5f9b493	deps: connect@2.25.10	2014-09-05 01:55:24 -04:00
Douglas Christopher Wilson	4d032cda05	3.16.9	2014-08-30 01:22:06 -04:00
Douglas Christopher Wilson	4127ba10b0	deps: connect@2.25.9	2014-08-30 01:19:53 -04:00
Douglas Christopher Wilson	0299bee8fa	3.16.8	2014-08-27 21:09:18 -04:00
Douglas Christopher Wilson	6a581c9961	deps: connect@2.25.8	2014-08-27 21:04:41 -04:00
Douglas Christopher Wilson	0b12cc0cac	3.16.7	2014-08-18 22:45:17 -04:00
Douglas Christopher Wilson	fdd0ccabe8	docs: flatten badges for github look	2014-08-18 22:45:13 -04:00
Douglas Christopher Wilson	8c36eab679	docs: use shields.io badges	2014-08-18 22:19:21 -04:00
Douglas Christopher Wilson	5c145b5490	build: add link to homepage	2014-08-18 22:17:25 -04:00
Raymond Feng	d7bef52591	build: move repository closes #2268 closes #2270	2014-08-18 22:07:35 -04:00
Douglas Christopher Wilson	1576a95e87	deps: send@0.8.3	2014-08-18 21:57:29 -04:00
Douglas Christopher Wilson	7f92fe66e0	deps: connect@2.25.7	2014-08-18 21:41:14 -04:00
Douglas Christopher Wilson	f13f4652da	3.16.6	2014-08-14 23:53:32 -04:00
Douglas Christopher Wilson	059c068c7b	deps: send@0.8.2 fixes #2300	2014-08-14 23:52:07 -04:00
Douglas Christopher Wilson	49947f1476	deps: connect@2.25.6	2014-08-14 23:49:39 -04:00
Douglas Christopher Wilson	0dddd772c0	3.16.5	2014-08-11 22:30:09 -04:00
Douglas Christopher Wilson	0f87c6f392	deps: connect@2.25.5	2014-08-11 22:29:35 -04:00
Douglas Christopher Wilson	7119f2b16d	3.16.4	2014-08-10 22:22:58 -04:00
Douglas Christopher Wilson	a57efea173	Fix original URL parsing in res.location	2014-08-10 22:20:54 -04:00
Douglas Christopher Wilson	4a4ca7347a	deps: parseurl@~1.3.0	2014-08-10 22:19:10 -04:00
Douglas Christopher Wilson	570f60d36e	deps: connect@2.25.4	2014-08-10 22:18:12 -04:00
Douglas Christopher Wilson	d13e613584	3.16.3	2014-08-07 22:32:16 -04:00
Douglas Christopher Wilson	9204e1f42a	deps: connect@2.25.3	2014-08-07 22:31:53 -04:00
Douglas Christopher Wilson	ddac571fdf	3.16.2	2014-08-07 11:59:54 -04:00
Douglas Christopher Wilson	982d24b475	deps: connect@2.25.2	2014-08-07 11:53:40 -04:00
Douglas Christopher Wilson	ea427c1bb4	3.16.1	2014-08-06 18:07:31 -04:00
Douglas Christopher Wilson	0bd6c311cf	deps: mocha@~1.21.4	2014-08-06 18:06:19 -04:00
Douglas Christopher Wilson	7f606ebf29	deps: connect@2.25.1	2014-08-06 18:05:50 -04:00
Douglas Christopher Wilson	c652cf7eed	3.16.0	2014-08-06 01:40:46 -04:00
Douglas Christopher Wilson	19fd6f85b0	deps: connect-redis@~1.5.0	2014-08-06 01:39:12 -04:00
Douglas Christopher Wilson	b6c5b0511f	deps: jade@~1.5.0	2014-08-06 01:37:58 -04:00
Douglas Christopher Wilson	0e42a37edd	deps: send@0.8.1	2014-08-06 01:37:13 -04:00
Douglas Christopher Wilson	b24ed15878	deps: connect@2.25.0	2014-08-06 01:35:00 -04:00
Douglas Christopher Wilson	15590d75b2	3.15.3	2014-08-04 17:31:52 -04:00
Douglas Christopher Wilson	e8b471ff4f	fix res.sendfile regression for serving directory index files	2014-08-04 17:30:25 -04:00
Douglas Christopher Wilson	767db01b79	deps: connect@2.24.3	2014-08-04 17:26:43 -04:00
Douglas Christopher Wilson	696e150f0a	3.15.2	2014-07-27 15:53:45 -04:00
Douglas Christopher Wilson	819265c7ae	deps: send@0.7.2	2014-07-27 15:41:54 -04:00
Douglas Christopher Wilson	baf8b14a71	deps: depd@0.4.4 fixes #2262	2014-07-27 15:41:19 -04:00
Douglas Christopher Wilson	06e7685d65	deps: connect@2.24.2	2014-07-27 15:40:19 -04:00
Douglas Christopher Wilson	9f4968aaa3	3.15.1	2014-07-26 17:42:18 -04:00
Douglas Christopher Wilson	afea3c0ae8	deps: mocha@~1.21.0	2014-07-26 17:36:42 -04:00
Douglas Christopher Wilson	edaabe66cf	deps: send@0.7.1	2014-07-26 17:36:40 -04:00
Douglas Christopher Wilson	f724730e1a	Adjust wording on deprecation messages	2014-07-26 17:36:39 -04:00
Douglas Christopher Wilson	e49d0dc9e3	deps: depd@0.4.3 fixes #2262	2014-07-26 17:36:24 -04:00
Douglas Christopher Wilson	e7a3fbaf48	deps: connect@2.24.1	2014-07-26 17:30:13 -04:00
Douglas Christopher Wilson	928952e7f0	3.15.0	2014-07-23 00:53:19 -04:00
Ashley Streb	a28b7a85cf	Fix req.protocol for proxy-direct connections fixes #2252	2014-07-23 00:19:10 -04:00
Douglas Christopher Wilson	3fc8dc54ee	docs: replace Gittip badge	2014-07-23 00:13:21 -04:00
Douglas Christopher Wilson	0d77305a1a	Pass options from res.sendfile to send fixes #2017	2014-07-23 00:08:15 -04:00
Douglas Christopher Wilson	323c185079	deps: send@0.7.0	2014-07-23 00:05:45 -04:00
Douglas Christopher Wilson	1d0da9036b	deps: parseurl@~1.2.0	2014-07-22 23:53:50 -04:00
Douglas Christopher Wilson	683ba1cd75	deps: depd@0.4.2	2014-07-22 23:52:44 -04:00
Douglas Christopher Wilson	e4ff5281c9	deps: connect@2.24.0	2014-07-22 23:50:36 -04:00
Douglas Christopher Wilson	7414a1f463	deps: debug@1.0.4	2014-07-18 14:18:35 -04:00
Douglas Christopher Wilson	916c53737d	3.14.0	2014-07-11 13:11:31 -04:00
Douglas Christopher Wilson	b2382a7336	Remove unnecessary escaping in res.jsonp	2014-07-11 00:20:11 -04:00
Douglas Christopher Wilson	f684a64df7	Add explicit "Rosetta Flash JSONP abuse" protection	2014-07-11 00:15:55 -04:00
Douglas Christopher Wilson	5d03d0eac8	Deprecate res.redirect(url, status)	2014-07-10 23:21:16 -04:00
Yad Smood	544c6665f5	Fix res.send(status, num) to send num as json fixes #2226	2014-07-10 23:19:57 -04:00
Douglas Christopher Wilson	cf8005e63f	deps: basic-auth@1.0.0	2014-07-10 23:07:45 -04:00
Douglas Christopher Wilson	25ef8425d2	deps: methods@1.1.0	2014-07-10 23:06:15 -04:00
Douglas Christopher Wilson	577cc1d1a0	deps: parseurl@~1.1.3	2014-07-10 23:03:26 -04:00
Douglas Christopher Wilson	3c87a6aede	deps: debug@1.0.3	2014-07-10 23:02:24 -04:00
Douglas Christopher Wilson	7c1f90bf16	deps: istanbul@0.3.0	2014-07-10 22:57:08 -04:00
Douglas Christopher Wilson	7bcf5f5085	deps: connect@2.23.0	2014-07-10 22:56:31 -04:00
Douglas Christopher Wilson	abe0ffa311	3.13.0	2014-07-04 00:40:01 -04:00
Douglas Christopher Wilson	b601d64203	tests: fix inconsistent test	2014-07-04 00:38:59 -04:00
Douglas Christopher Wilson	f381f2d9b6	add deprecation message to req.auth	2014-07-04 00:24:01 -04:00
Douglas Christopher Wilson	12507cfcd0	deps: connect@2.22.0	2014-07-03 23:09:44 -04:00
Douglas Christopher Wilson	185e327e29	add deprecation message to app.configure	2014-07-03 14:13:39 -04:00
Douglas Christopher Wilson	c468f5ff20	deps: send@0.5.0	2014-07-03 13:10:33 -04:00
Douglas Christopher Wilson	9bb47fba30	3.12.1	2014-06-26 18:35:54 -04:00
Douglas Christopher Wilson	78d489d730	deps: cookie-signature@1.0.4	2014-06-26 18:26:34 -04:00
Douglas Christopher Wilson	8ffb9f9477	deps: connect@2.21.1	2014-06-26 18:25:48 -04:00
Douglas Christopher Wilson	9cb147370e	deps: istanbul@0.2.12	2014-06-26 18:21:26 -04:00
Douglas Christopher Wilson	75422c16bf	3.12.0	2014-06-21 21:57:02 -04:00
Douglas Christopher Wilson	e66667e465	Use media-typer to alter content-type charset	2014-06-21 21:09:12 -04:00
Douglas Christopher Wilson	7d6208e0af	deps: connect@2.21.0	2014-06-21 21:09:10 -04:00
Douglas Christopher Wilson	2a105df9f2	3.11.0	2014-06-19 23:36:00 -04:00
Douglas Christopher Wilson	9c731f1883	deprecate things with depd module	2014-06-19 23:34:58 -04:00
Douglas Christopher Wilson	5a4e9125de	deps: connect@2.20.2	2014-06-19 23:24:07 -04:00
Douglas Christopher Wilson	9db1367c2d	deps: buffer-crc32@0.2.3	2014-06-19 22:55:21 -04:00
Douglas Christopher Wilson	73c5533e66	3.10.5	2014-06-12 00:28:08 -04:00
Douglas Christopher Wilson	3b1f747f96	deps: send@0.4.3	2014-06-12 00:24:21 -04:00
Douglas Christopher Wilson	9e9827d236	deps: debug@1.0.2	2014-06-12 00:23:15 -04:00
Douglas Christopher Wilson	a76d508424	deps: connect@2.19.6	2014-06-12 00:20:30 -04:00
Douglas Christopher Wilson	f881784e9b	3.10.4	2014-06-09 18:53:52 -04:00
Douglas Christopher Wilson	5af625903f	deps: send@0.4.2	2014-06-09 18:51:55 -04:00
Douglas Christopher Wilson	dc94f305cc	deps: debug@1.0.1	2014-06-09 18:50:36 -04:00
Douglas Christopher Wilson	8060a49c6c	deps: connect@2.19.5	2014-06-09 18:50:00 -04:00
Douglas Christopher Wilson	2fd31f6ea6	3.10.3	2014-06-05 23:38:58 -04:00
Douglas Christopher Wilson	9cf7bba8f0	deps: connect@2.19.4	2014-06-05 23:37:22 -04:00
Douglas Christopher Wilson	2e257d1cf7	build: use compressed formats in package	2014-06-05 19:45:00 -04:00
Douglas Christopher Wilson	56831d7799	deps: debug@1.0.0	2014-06-05 19:34:05 -04:00
Jonathan Ong	6d65ae5ba6	use vary@0.1.0 with backwards compatibility closes #2161	2014-06-05 19:32:32 -04:00
Douglas Christopher Wilson	c919b4a573	3.10.2	2014-06-03 21:35:34 -04:00
Douglas Christopher Wilson	fe6f392c2d	deps: connect@2.19.3	2014-06-03 21:33:55 -04:00
Douglas Christopher Wilson	3b34a537ee	3.10.1	2014-06-03 16:45:09 -04:00
Douglas Christopher Wilson	ad79ce9c4b	deps: connect@2.19.2	2014-06-03 16:44:29 -04:00
Douglas Christopher Wilson	721f6388c3	deps: proxy-addr@1.0.1	2014-06-03 16:42:49 -04:00
Douglas Christopher Wilson	298ac11018	3.10.0	2014-06-03 00:40:27 -04:00
Douglas Christopher Wilson	bb6e207336	deps: connect@2.19.1	2014-06-03 00:37:57 -04:00
Douglas Christopher Wilson	f433b7c7cf	replace utils.escape with html-escape	2014-06-03 00:37:32 -04:00
Douglas Christopher Wilson	a94278abd1	deps: send@0.4.1	2014-06-02 21:31:23 -04:00
Douglas Christopher Wilson	a7cd5a2553	deps: methods@1.0.1	2014-06-02 19:19:56 -04:00
Douglas Christopher Wilson	0dc5836d5e	3.9.0	2014-05-30 21:35:12 -04:00
Douglas Christopher Wilson	8751d7ecf8	tests: add more tests	2014-05-30 21:28:48 -04:00
Douglas Christopher Wilson	c21226aa7c	improve etag control for res.send closes #1435 closes #2129	2014-05-30 21:02:21 -04:00
Douglas Christopher Wilson	3e358458f4	tests: add more etag tests	2014-05-30 19:51:32 -04:00
Douglas Christopher Wilson	766b3aecf7	deps: update example dependencies	2014-05-29 23:39:52 -04:00
Douglas Christopher Wilson	8ab96ab80d	mark res.send ETag as weak and reduce collisions	2014-05-29 23:14:21 -04:00
Douglas Christopher Wilson	1f2e00ef8d	deps: should@~4.0.0	2014-05-29 22:53:59 -04:00
Douglas Christopher Wilson	b49453cf0d	update send to 0.4.0 closes #2150	2014-05-29 22:32:03 -04:00
Douglas Christopher Wilson	faffcb889c	update connect to 2.18.0	2014-05-29 22:21:53 -04:00
Tiago Relvao	3c0ec59432	Include ETag in HEAD requests backport of commit `3c7310ebcb`	2014-05-28 22:31:00 -04:00
Douglas Christopher Wilson	d4a2843500	tests: add param test with encoded value closes #2143	2014-05-28 22:30:24 -04:00
Douglas Christopher Wilson	e7ad49bbbe	tests: add accepts test with params	2014-05-28 00:30:29 -04:00
Douglas Christopher Wilson	ad9a414fae	tests: add more acceptance tests	2014-05-28 00:24:24 -04:00
Douglas Christopher Wilson	c18c2a8e68	tests: exclude untestable lines in examples from coverage	2014-05-28 00:07:27 -04:00
Douglas Christopher Wilson	1d54868c12	update supertest to 0.13.0	2014-05-27 23:54:34 -04:00
Douglas Christopher Wilson	f7e73e2da0	3.8.1	2014-05-27 23:43:13 -04:00
Douglas Christopher Wilson	867728b5ab	update connect to 2.17.3	2014-05-27 23:02:27 -04:00