From a003cfab034fbadb1c78ae337ee8ab389adda217 Mon Sep 17 00:00:00 2001
From: Wes Todd <wes@wesleytodd.com>
Date: Wed, 20 Mar 2024 16:39:46 -0500
Subject: [PATCH] Allow passing non-strings to res.location with new encoding
 handling checks fixes #5554 #5555

---
 History.md           |  5 +++++
 lib/response.js      |  2 +-
 test/res.location.js | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index b6208ea7e3..2fda95c155 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+unreleased changes
+==========
+
+  * Allow passing non-strings to res.location with new encoding handling checks
+
 4.19.0 / 2024-03-20
 ==========
 
diff --git a/lib/response.js b/lib/response.js
index f7c94d10e7..6fddbf3516 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -905,7 +905,7 @@ res.cookie = function (name, value, options) {
  */
 
 res.location = function location(url) {
-  var loc = url;
+  var loc = String(url);
 
   // "back" is an alias for the referrer
   if (url === 'back') {
diff --git a/test/res.location.js b/test/res.location.js
index 71fbaec03d..d1bbf4b687 100644
--- a/test/res.location.js
+++ b/test/res.location.js
@@ -145,5 +145,20 @@ describe('res', function(){
         .expect(200, done)
       })
     })
+
+    if (typeof URL !== 'undefined') {
+      it('should accept an instance of URL', function (done) {
+        var app = express();
+
+        app.use(function(req, res){
+          res.location(new URL('http://google.com/')).end();
+        });
+
+        request(app)
+          .get('/')
+          .expect('Location', 'http://google.com/')
+          .expect(200, done);
+      });
+    }
   })
 })