From 05c5d2211f7dfbe2e90aa46b051323fa7bbf0b03 Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Tue, 20 Sep 2022 09:31:44 +0200
Subject: [PATCH] regression bug with parse-url update

---
 lib/utils/http-requestor.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/utils/http-requestor.js b/lib/utils/http-requestor.js
index 04e2cb8c..6dd1f35b 100644
--- a/lib/utils/http-requestor.js
+++ b/lib/utils/http-requestor.js
@@ -28,8 +28,8 @@ class HttpRequestor extends BaseRequestor {
     assert(['GET', 'POST'].includes(this.method));
 
     const u = this._parsedUrl = parseUrl(this.url);
-    this._baseUrl = `${u.protocol}://${u.resource}:${u.port || 80}`;
-    this._resource = u.resource;
+    if (u.port) this._baseUrl = `${u.protocol}://${u.resource}:${u.port}`;
+    else this._baseUrl = `${u.protocol}://${u.resource}`;
     this._protocol = u.protocol;
     this._search = u.search;
     this._usePools = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);
@@ -49,7 +49,10 @@ class HttpRequestor extends BaseRequestor {
         this.logger.debug(`HttpRequestor:created pool for ${this._baseUrl}`);
       }
     }
-    else this.client = new Client(`${u.protocol}://${u.resource}:${u.port || 80}`);
+    else {
+      if (u.port) this.client = new Client(`${u.protocol}://${u.resource}:${u.port}`);
+      else this.client = new Client(`${u.protocol}://${u.resource}`);
+    }
   }
 
   get baseUrl() {
@@ -101,7 +104,8 @@ class HttpRequestor extends BaseRequestor {
           query = u.query;
         }
         else {
-          client = newClient = new Client(`${u.protocol}://${u.resource}:${u.port || 80}`);
+          if (u.port) client = newClient = new Client(`${u.protocol}://${u.resource}:${u.port}`);
+          else client = newClient = new Client(`${u.protocol}://${u.resource}`);
           path = u.pathname;
           query = u.query;
         }