deps: etag@~1.7.0

fixes expressjs#2667

Author: dougwilson

History.md

@@ -26,6 +26,14 @@
     - perf: deduce the scope of try-catch deopt
     - perf: remove argument reassignments
   * deps: [email protected]
+  * 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: [email protected]
     - Work in global strict mode
 

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",

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)
       })
     })

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"');
   })
 })