always discard default ports when get/set buffer - fixes #5367

packages/server/lib/util/buffers.js

@@ -20,6 +20,9 @@ module.exports = {
   },
 
   set (obj = {}) {
+    obj.url = uri.removeDefaultPort(obj.url)
+    obj.originalUrl = uri.removeDefaultPort(obj.originalUrl)
+
     return buffers.push(_.pick(obj, 'url', 'originalUrl', 'jar', 'stream', 'response', 'details'))
   },
 
@@ -38,17 +41,7 @@ module.exports = {
       return b
     }
 
-    let parsed = uri.parse(str)
-
-    //# if we're on https and we have a port
-    //# then attempt to find the buffer by
-    //# slicing off the port since our buffer
-    //# was likely stored without a port
-    if ((parsed.protocol === 'https:') && parsed.port) {
-      parsed = uri.removePort(parsed)
-
-      return find(parsed.format())
-    }
+    return find(uri.removeDefaultPort(str))
   },
 
   take (str) {