From d6a9ddcd4011bd08f1a913de5d859328fe205117 Mon Sep 17 00:00:00 2001 From: Brian Reavis Date: Sat, 20 Jun 2015 12:22:41 -0600 Subject: [PATCH] Updated etag library. --- package.json | 2 +- test/TileServer.js | 14 +++++++------- test/index.js | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 6d256f1..9ddd04d 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "async": "^0.9.0", "bbox-intersect": "^0.1.1", - "etag": "^1.5.1", + "etag": "1.7.0", "lodash": "^2.4.1", "lru-cache": "^2.5.0", "tilebelt": "^0.7.1" diff --git a/test/TileServer.js b/test/TileServer.js index 13b3c33..c4a0a9f 100755 --- a/test/TileServer.js +++ b/test/TileServer.js @@ -188,7 +188,7 @@ describe('TileServer', function() { 'X-Test': 'hello', 'Content-Length': 8, 'Cache-Control': HEADER_CACHECONTROL, - 'ETag': '"0fyOrzaTe+DDuoz+Ciwb/g=="' + 'ETag': '"8-0fyOrzaTe+DDuoz+Ciwb/g"' }); done(); }); @@ -258,7 +258,7 @@ describe('TileServer', function() { 'X-Powered-By': HEADER_XPOWEREDBY, 'X-Test': 'hello', 'Cache-Control': HEADER_CACHECONTROL, - 'ETag': '"0fyOrzaTe+DDuoz+Ciwb/g=="', + 'ETag': '"8-0fyOrzaTe+DDuoz+Ciwb/g"', 'Content-Length': 8 }); done(); @@ -275,14 +275,14 @@ describe('TileServer', function() { } }); - var req = TileRequest.parse('/layer/1/2/3/tile.png', {'if-none-match': '"0fyOrzaTe+DDuoz+Ciwb/g=="'}, 'GET'); + var req = TileRequest.parse('/layer/1/2/3/tile.png', {'if-none-match': '"8-0fyOrzaTe+DDuoz+Ciwb/g"'}, 'GET'); server.serve(req, false, function(status, buffer, headers) { assert.equal(status, 304); assert.equal(buffer.toString('utf8'), ''); assert.deepEqual(headers, { 'X-Powered-By': HEADER_XPOWEREDBY, 'X-Test': 'hello', - 'ETag': '"0fyOrzaTe+DDuoz+Ciwb/g=="', + 'ETag': '"8-0fyOrzaTe+DDuoz+Ciwb/g"', 'Cache-Control': HEADER_CACHECONTROL, 'Content-Length': 8 }); @@ -309,7 +309,7 @@ describe('TileServer', function() { 'X-Test': 'hello', 'Content-Length': 8, 'Cache-Control': HEADER_CACHECONTROL, - 'ETag': '"0fyOrzaTe+DDuoz+Ciwb/g=="' + 'ETag': '"8-0fyOrzaTe+DDuoz+Ciwb/g"' }); done(); }); @@ -337,7 +337,7 @@ describe('TileServer', function() { 'X-Res-Hook-2': '1', 'Content-Length': 17, 'Cache-Control': HEADER_CACHECONTROL, - 'ETag': '"miLcq2wD06H4X7CEVf44aA=="' + 'ETag': '"11-miLcq2wD06H4X7CEVf44aA"' }); }, write: function(buffer) { @@ -459,7 +459,7 @@ describe('TileServer', function() { 'X-Test': 'hello', 'Content-Length': 6, 'Cache-Control': HEADER_CACHECONTROL, - 'ETag': '"tKiEF7PQFw11TGR8MLchag=="' + 'ETag': '"6-tKiEF7PQFw11TGR8MLchag"' }); done(); }); diff --git a/test/index.js b/test/index.js index 057fb62..0208c87 100644 --- a/test/index.js +++ b/test/index.js @@ -69,7 +69,7 @@ describe('require("tilestrata")', function() { 'X-Powered-By': 'TileStrata/' + version, 'Content-Length': 4, 'Cache-Control': 'max-age=60', - 'ETag': '"ExgdjMAeOQv2TJ5LDXp58w=="' + 'ETag': '"4-ExgdjMAeOQv2TJ5LDXp58w"' }; var server = new TileServer();