From 9ae08f932e11dcf53f938c8e6ef184cc2c5adf68 Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Wed, 17 Jun 2015 01:17:42 -0400 Subject: [PATCH 01/12] build: should@6.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6dfbe7e362..57f8575701 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "istanbul": "0.3.9", "marked": "0.3.3", "mocha": "2.2.5", - "should": "6.0.1", + "should": "6.0.3", "supertest": "1.0.1" }, "engines": { From a20a9a1a2e4dee052ca6832af6ae16a74c1ed9e0 Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Wed, 17 Jun 2015 01:21:20 -0400 Subject: [PATCH 02/12] deps: mkdirp@0.5.1 --- History.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index fbbed9e135..8aa0e86df1 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,9 @@ +3.x +=== + + * deps: mkdirp@0.5.1 + - Work in global strict mode + 3.20.3 / 2015-05-17 =================== diff --git a/package.json b/package.json index 57f8575701..f464255848 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "fresh": "0.2.4", "merge-descriptors": "1.0.0", "methods": "~1.1.1", - "mkdirp": "0.5.0", + "mkdirp": "0.5.1", "parseurl": "~1.3.0", "proxy-addr": "~1.0.8", "range-parser": "~1.0.2", From 29f51c67a612ecdf08494bc440f22918ce72a32e Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Wed, 17 Jun 2015 01:24:21 -0400 Subject: [PATCH 03/12] docs: fix typos in history closes #2676 closes #2677 closes #2678 --- History.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/History.md b/History.md index 8aa0e86df1..e6af31f0b6 100644 --- a/History.md +++ b/History.md @@ -852,7 +852,7 @@ * update commander * jsonp: check if callback is a function * router: wrap encodeURIComponent in a try/catch #1735 (@lxe) - * res.format: now includes chraset @1747 (@sorribas) + * res.format: now includes charset @1747 (@sorribas) * res.links: allow multiple calls @1746 (@sorribas) 3.4.0 / 2013-09-07 @@ -1131,7 +1131,7 @@ * Added another example to content-negotiation * Added `fresh` dep * Changed: `res.send()` always checks freshness - * Fixed: expose connects mime module. Cloases #1165 + * Fixed: expose connects mime module. Closes #1165 3.0.0beta2 / 2012-06-06 ================== @@ -1213,7 +1213,7 @@ * Added `req.ips` * Added `req.fresh` * Added `req.stale` - * Added comma-delmited / array support for `req.accepts()` + * Added comma-delimited / array support for `req.accepts()` * Added debug instrumentation * Added `res.set(obj)` * Added `res.set(field, value)` From 62dfa792b26e32c99c27b07d490fa156d61a7782 Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 20:08:32 -0400 Subject: [PATCH 04/12] deps: connect@2.30.0 --- History.md | 16 ++++++++++++++++ package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index e6af31f0b6..4fc52c4b75 100644 --- a/History.md +++ b/History.md @@ -1,6 +1,22 @@ 3.x === + * deps: connect@2.30.0 + - deps: body-parser@~1.13.1 + - deps: bytes@2.1.0 + - deps: compression@~1.5.0 + - deps: cookie@0.1.3 + - deps: cookie-parser@~1.3.5 + - deps: csurf@~1.8.3 + - deps: errorhandler@~1.4.0 + - deps: express-session@~1.11.3 + - deps: finalhandler@0.4.0 + - deps: fresh@0.3.0 + - deps: morgan@~1.6.0 + - deps: serve-favicon@~2.3.0 + - deps: serve-index@~1.7.0 + - deps: serve-static@~1.10.0 + - deps: type-is@~1.6.3 * deps: mkdirp@0.5.1 - Work in global strict mode diff --git a/package.json b/package.json index f464255848..e060ace59a 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ ], "dependencies": { "basic-auth": "1.0.0", - "connect": "2.29.2", + "connect": "2.30.0", "content-disposition": "0.5.0", "content-type": "~1.0.1", "commander": "2.6.0", From 92b5fa8c53fd451623523a41c3cedfd2efb8f4aa Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 20:10:16 -0400 Subject: [PATCH 05/12] build: should@7.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e060ace59a..123a2c5ee6 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "istanbul": "0.3.9", "marked": "0.3.3", "mocha": "2.2.5", - "should": "6.0.3", + "should": "7.0.1", "supertest": "1.0.1" }, "engines": { From 5207b99e0874df268cb8f54eabedb314485890cd Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 20:34:04 -0400 Subject: [PATCH 06/12] deps: basic-auth@1.0.2 --- History.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 4fc52c4b75..e681d5d75b 100644 --- a/History.md +++ b/History.md @@ -1,6 +1,11 @@ 3.x === + * deps: basic-auth@1.0.2 + - perf: enable strict mode + - perf: hoist regular expression + - perf: parse with regular expressions + - perf: remove argument reassignment * deps: connect@2.30.0 - deps: body-parser@~1.13.1 - deps: bytes@2.1.0 diff --git a/package.json b/package.json index 123a2c5ee6..7ce2bfc0c3 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "api" ], "dependencies": { - "basic-auth": "1.0.0", + "basic-auth": "1.0.2", "connect": "2.30.0", "content-disposition": "0.5.0", "content-type": "~1.0.1", From 77402110b9402a6d327e232cc1518bc5110e651c Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 20:35:56 -0400 Subject: [PATCH 07/12] deps: cookie@0.1.3 --- History.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index e681d5d75b..3d09788d39 100644 --- a/History.md +++ b/History.md @@ -22,6 +22,9 @@ - deps: serve-index@~1.7.0 - deps: serve-static@~1.10.0 - deps: type-is@~1.6.3 + * deps: cookie@0.1.3 + - perf: deduce the scope of try-catch deopt + - perf: remove argument reassignments * deps: mkdirp@0.5.1 - Work in global strict mode diff --git a/package.json b/package.json index 7ce2bfc0c3..80e444a674 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "content-disposition": "0.5.0", "content-type": "~1.0.1", "commander": "2.6.0", - "cookie": "0.1.2", + "cookie": "0.1.3", "cookie-signature": "1.0.6", "debug": "~2.2.0", "depd": "~1.0.1", From 0fbf2078e16cd315fd1b1769c430488f70e7faba Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 20:36:48 -0400 Subject: [PATCH 08/12] deps: escape-html@1.0.2 --- History.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 3d09788d39..a533c2415d 100644 --- a/History.md +++ b/History.md @@ -25,6 +25,7 @@ * deps: cookie@0.1.3 - perf: deduce the scope of try-catch deopt - perf: remove argument reassignments + * deps: escape-html@1.0.2 * deps: mkdirp@0.5.1 - Work in global strict mode diff --git a/package.json b/package.json index 80e444a674..a771f9f42f 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "cookie-signature": "1.0.6", "debug": "~2.2.0", "depd": "~1.0.1", - "escape-html": "1.0.1", + "escape-html": "1.0.2", "etag": "~1.5.1", "fresh": "0.2.4", "merge-descriptors": "1.0.0", From c8d61b62693948568083d5ad3c4491e5cc6f5338 Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 20:54:26 -0400 Subject: [PATCH 09/12] deps: etag@~1.7.0 fixes #2667 --- History.md | 8 ++++++++ package.json | 2 +- test/res.send.js | 18 +++++++++--------- test/utils.js | 16 ++++++++-------- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/History.md b/History.md index a533c2415d..6ed7c762c2 100644 --- a/History.md +++ b/History.md @@ -26,6 +26,14 @@ - perf: deduce the scope of try-catch deopt - perf: remove argument reassignments * deps: escape-html@1.0.2 + * deps: etag@~1.7.0 + - Always include entity length in ETags for hash length extensions + - Generate non-Stats ETags using MD5 only (no longer CRC32) + - Improve stat performance by removing hashing + - Improve support for JXcore + - Remove base64 padding in ETags to shorten + - Support "fake" stats objects in environments without fs + - Use MD5 instead of MD4 in weak ETags over 1KB * deps: mkdirp@0.5.1 - Work in global strict mode diff --git a/package.json b/package.json index a771f9f42f..f3d51791a9 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "debug": "~2.2.0", "depd": "~1.0.1", "escape-html": "1.0.2", - "etag": "~1.5.1", + "etag": "~1.7.0", "fresh": "0.2.4", "merge-descriptors": "1.0.0", "methods": "~1.1.1", diff --git a/test/res.send.js b/test/res.send.js index 9ad8fd88fe..67f872285c 100644 --- a/test/res.send.js +++ b/test/res.send.js @@ -121,7 +121,7 @@ describe('res', function(){ request(app) .get('/') - .expect('ETag', 'W/"fz/jGo0ONwzb+aKy/rWipg=="') + .expect('ETag', 'W/"7ff-fFD7Se+Vsq6deAl063thow"') .expect(200, done); }) @@ -193,7 +193,7 @@ describe('res', function(){ request(app) .get('/') - .expect('ETag', 'W/"fz/jGo0ONwzb+aKy/rWipg=="') + .expect('ETag', 'W/"7ff-fFD7Se+Vsq6deAl063thow"') .expect(200, done); }) @@ -309,7 +309,7 @@ describe('res', function(){ request(app) .get('/') - .set('If-None-Match', 'W/"fz/jGo0ONwzb+aKy/rWipg=="') + .set('If-None-Match', 'W/"7ff-fFD7Se+Vsq6deAl063thow"') .expect(304, done); }) @@ -355,7 +355,7 @@ describe('res', function(){ request(app) .get('/') - .expect('ETag', 'W/"c-5aee35d8"') + .expect('ETag', 'W/"c-ZUfd0NJ26qwjlKF4r8qb2g"') .expect(200, done); }); @@ -371,7 +371,7 @@ describe('res', function(){ request(app) [method]('/') - .expect('ETag', 'W/"c-5aee35d8"') + .expect('ETag', 'W/"c-ZUfd0NJ26qwjlKF4r8qb2g"') .expect(200, done); }) }); @@ -387,7 +387,7 @@ describe('res', function(){ request(app) .get('/') - .expect('ETag', 'W/"0-0"') + .expect('ETag', 'W/"0-1B2M2Y8AsgTpgAmY7PhCfg"') .expect(200, done); }) @@ -403,7 +403,7 @@ describe('res', function(){ request(app) .get('/') - .expect('ETag', 'W/"fz/jGo0ONwzb+aKy/rWipg=="') + .expect('ETag', 'W/"7ff-fFD7Se+Vsq6deAl063thow"') .expect(200, done); }); @@ -485,7 +485,7 @@ describe('res', function(){ request(app) .get('/') - .expect('ETag', '"Otu60XkfuuPskIiUxJY4cA=="') + .expect('ETag', '"d-Otu60XkfuuPskIiUxJY4cA"') .expect(200, done); }) }) @@ -502,7 +502,7 @@ describe('res', function(){ request(app) .get('/') - .expect('ETag', 'W/"d-58988d13"') + .expect('ETag', 'W/"d-Otu60XkfuuPskIiUxJY4cA"') .expect(200, done) }) }) diff --git a/test/utils.js b/test/utils.js index b811762c59..750c84605f 100644 --- a/test/utils.js +++ b/test/utils.js @@ -5,46 +5,46 @@ var utils = require('../lib/utils') describe('utils.etag(body, encoding)', function(){ it('should support strings', function(){ utils.etag('express!') - .should.eql('"zZdv4imtWD49AHEviejT6A=="') + .should.eql('"8-zZdv4imtWD49AHEviejT6A"') }) it('should support utf8 strings', function(){ utils.etag('express❤', 'utf8') - .should.eql('"fsFba4IxwQS6h6Umb+FNxw=="') + .should.eql('"a-fsFba4IxwQS6h6Umb+FNxw"') }) it('should support buffer', function(){ var buf = new Buffer('express!') utils.etag(buf) - .should.eql('"zZdv4imtWD49AHEviejT6A=="'); + .should.eql('"8-zZdv4imtWD49AHEviejT6A"'); }) it('should support empty string', function(){ utils.etag('') - .should.eql('"1B2M2Y8AsgTpgAmY7PhCfg=="'); + .should.eql('"0-1B2M2Y8AsgTpgAmY7PhCfg"'); }) }) describe('utils.wetag(body, encoding)', function(){ it('should support strings', function(){ utils.wetag('express!') - .should.eql('W/"8-b8aabac7"') + .should.eql('W/"8-zZdv4imtWD49AHEviejT6A"') }) it('should support utf8 strings', function(){ utils.wetag('express❤', 'utf8') - .should.eql('W/"a-686b0af1"') + .should.eql('W/"a-fsFba4IxwQS6h6Umb+FNxw"') }) it('should support buffer', function(){ var buf = new Buffer('express!') utils.wetag(buf) - .should.eql('W/"8-b8aabac7"'); + .should.eql('W/"8-zZdv4imtWD49AHEviejT6A"'); }) it('should support empty string', function(){ utils.wetag('') - .should.eql('W/"0-0"'); + .should.eql('W/"0-1B2M2Y8AsgTpgAmY7PhCfg"'); }) }) From 14b849246e9b72eb61dd9118b0409ca49d50f55e Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 20:56:03 -0400 Subject: [PATCH 10/12] deps: send@0.13.0 --- History.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 6ed7c762c2..6c3684d894 100644 --- a/History.md +++ b/History.md @@ -36,6 +36,19 @@ - Use MD5 instead of MD4 in weak ETags over 1KB * deps: mkdirp@0.5.1 - Work in global strict mode + * deps: send@0.13.0 + - Allow Node.js HTTP server to set `Date` response header + - Fix incorrectly removing `Content-Location` on 304 response + - Improve the default redirect response headers + - Send appropriate headers on default error response + - Use `http-errors` for standard emitted errors + - Use `statuses` instead of `http` module for status messages + - deps: escape-html@1.0.2 + - deps: etag@~1.7.0 + - deps: fresh@0.3.0 + - deps: on-finished@~2.3.0 + - perf: enable strict mode + - perf: remove unnecessary array allocations 3.20.3 / 2015-05-17 =================== diff --git a/package.json b/package.json index f3d51791a9..a36a43c382 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "parseurl": "~1.3.0", "proxy-addr": "~1.0.8", "range-parser": "~1.0.2", - "send": "0.12.3", + "send": "0.13.0", "utils-merge": "1.0.0", "vary": "~1.0.0" }, From 4729685912b8d69c53739b04a2f3477b67dcc602 Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 20:56:48 -0400 Subject: [PATCH 11/12] deps: fresh@0.3.0 --- History.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 6c3684d894..dbe149cddd 100644 --- a/History.md +++ b/History.md @@ -34,6 +34,8 @@ - Remove base64 padding in ETags to shorten - Support "fake" stats objects in environments without fs - Use MD5 instead of MD4 in weak ETags over 1KB + * deps: fresh@0.3.0 + - Add weak `ETag` matching support * deps: mkdirp@0.5.1 - Work in global strict mode * deps: send@0.13.0 diff --git a/package.json b/package.json index a36a43c382..7b077c9b9a 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "depd": "~1.0.1", "escape-html": "1.0.2", "etag": "~1.7.0", - "fresh": "0.2.4", + "fresh": "0.3.0", "merge-descriptors": "1.0.0", "methods": "~1.1.1", "mkdirp": "0.5.1", From 115dbe1a4d817d925d2dc87731a7ceb1663152ed Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Thu, 18 Jun 2015 21:14:56 -0400 Subject: [PATCH 12/12] 3.21.0 --- History.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/History.md b/History.md index dbe149cddd..bb06bdb6f4 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,5 @@ -3.x -=== +3.21.0 / 2015-06-18 +=================== * deps: basic-auth@1.0.2 - perf: enable strict mode diff --git a/package.json b/package.json index 7b077c9b9a..e8d2f00395 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "express", "description": "Sinatra inspired web development framework", - "version": "3.20.3", + "version": "3.21.0", "author": "TJ Holowaychuk ", "contributors": [ "Aaron Heckmann ",