From 0c11fad159898cdc69fd9ab63269b72468ecaf6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= Date: Tue, 10 Sep 2024 02:58:54 +0200 Subject: [PATCH 1/2] Merge commit from fork Co-authored-by: Chris de Almeida --- index.js | 3 +-- test/test.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index b7d3984..3f3e64e 100644 --- a/index.js +++ b/index.js @@ -195,8 +195,7 @@ function createRedirectDirectoryListener () { // reformat the URL var loc = encodeUrl(url.format(originalUrl)) - var doc = createHtmlDocument('Redirecting', 'Redirecting to ' + - escapeHtml(loc) + '') + var doc = createHtmlDocument('Redirecting', 'Redirecting to ' + escapeHtml(loc)) // send redirect response res.statusCode = 301 diff --git a/test/test.js b/test/test.js index e1e3fd1..7bce038 100644 --- a/test/test.js +++ b/test/test.js @@ -483,7 +483,7 @@ describe('serveStatic()', function () { request(server) .get('/users') .expect('Location', '/users/') - .expect(301, //, done) + .expect(301, /\/users\//, done) }) it('should redirect directories with query string', function (done) { @@ -505,7 +505,7 @@ describe('serveStatic()', function () { .get('/snow') .expect('Location', '/snow%20%E2%98%83/') .expect('Content-Type', /html/) - .expect(301, />Redirecting to \/snow%20%E2%98%83\/<\/a>Redirecting to \/snow%20%E2%98%83\/ Date: Tue, 10 Sep 2024 03:04:32 +0200 Subject: [PATCH 2/2] 1.16.0 --- HISTORY.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 6b58456..fde1d72 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,9 @@ +1.16.0 / 2024-09-10 +=================== + +* Remove link renderization in html while redirecting + + 1.15.0 / 2022-03-24 =================== diff --git a/package.json b/package.json index 9d935f5..47d9789 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "serve-static", "description": "Serve static files", - "version": "1.15.0", + "version": "1.16.0", "author": "Douglas Christopher Wilson ", "license": "MIT", "repository": "expressjs/serve-static",