Merge tag '3.15.0'

Author: dougwilson

History.md

@@ -309,6 +309,40 @@ unreleased
    - `app.route()` - Proxy to the app's `Router#route()` method to create a new route
    - Router & Route - public API
 
+3.15.0 / 2014-07-22
+===================
+
+  * Fix `req.protocol` for proxy-direct connections
+  * Pass options from `res.sendfile` to `send`
+  * deps: [email protected]
+    - deps: body-parser@~1.5.0
+    - deps: compression@~1.0.9
+    - deps: connect-timeout@~1.2.1
+    - deps: [email protected]
+    - deps: [email protected]
+    - deps: express-session@~1.7.0
+    - deps: [email protected]
+    - deps: method-override@~2.1.2
+    - deps: morgan@~1.2.0
+    - deps: [email protected]
+    - deps: parseurl@~1.2.0
+    - deps: serve-static@~1.4.0
+  * deps: [email protected]
+  * deps: [email protected]
+    - 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: [email protected]
+    - Add `dotfiles` option
+    - Cap `maxAge` value to 1 year
+    - deps: [email protected]
+    - deps: [email protected]
+
 3.14.0 / 2014-07-11
 ===================
 

Readme.md

@@ -5,7 +5,7 @@
   [![NPM Version](https://badge.fury.io/js/express.svg)](https://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](https://img.shields.io/gittip/visionmedia.svg)](https://www.gittip.com/visionmedia/)
+  [![Gittip](http://img.shields.io/gittip/dougwilson.svg)](https://www.gittip.com/dougwilson/)
 
 ```js
 var express = require('express')

lib/response.js

@@ -312,10 +312,10 @@ res.jsonp = function jsonp(obj) {
  *
  * Options:
  *
- *   - `maxAge`  defaulting to 0 (can be string converted by `ms`)
- *   - `root`    root directory for relative filenames
- *   - `headers` object of headers to serve with file
- *   - `hidden`  serve hidden files, defaulting to false
+ *   - `maxAge`   defaulting to 0 (can be string converted by `ms`)
+ *   - `root`     root directory for relative filenames
+ *   - `headers`  object of headers to serve with file
+ *   - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them
  *
  * Other options are passed along to `send`.
  *