Fix Agent.normalizeAuthority(...)

szmarczak · Feb 28, 2020 · 8c38c7e · 8c38c7e
1 parent 06fe862
commit 8c38c7e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/source/agent.js b/source/agent.js
@@ -165,7 +165,11 @@ class Agent extends EventEmitter {
 			url = new URL(url);
 		}
 
-		return servername ? `https://${servername}:${url.port || 443}` : url.origin;
+		if (servername && url.hostname !== servername) {
+			url.hostname = servername;
+		}
+
+		return url.origin;
 	}
 
 	normalizeOptions(options) {

diff --git a/source/client-request.js b/source/client-request.js
@@ -258,7 +258,7 @@ class ClientRequest extends Writable {
 					// Forwards data
 					stream.on('data', chunk => {
 						if (!response.push(chunk)) {
-							this.pause();
+							stream.pause();
 						}
 					});
 

diff --git a/test/agent.js b/test/agent.js
@@ -1006,3 +1006,12 @@ test('errors on failure', async t => {
 	t.is(error.port, 443);
 	t.is(error.address, '127.0.0.1');
 });
+
+test('properly normalizes origin', t => {
+	t.is(Agent.normalizeOrigin('https://google.com'), 'https://google.com');
+	t.is(Agent.normalizeOrigin('https://google.com', 'gmail.com'), 'https://gmail.com');
+	t.is(Agent.normalizeOrigin('https://google.com:443'), 'https://google.com');
+	t.is(Agent.normalizeOrigin('https://google.com:443', 'gmail.com'), 'https://gmail.com');
+	t.is(Agent.normalizeOrigin('https://google.com:4434'), 'https://google.com:4434');
+	t.is(Agent.normalizeOrigin('https://google.com:4434', 'gmail.com'), 'https://gmail.com:4434');
+});
diff --git a/test/auto.js b/test/auto.js
@@ -471,3 +471,13 @@ test.serial('does not reuse HTTP/1.1 TLS sockets if custom `createConnection` op
 
 	t.pass();
 });
+
+test('http2 works (Internet connection)', async t => {
+	const request = await http2.auto('https://httpbin.org/anything');
+	request.end();
+
+	const response = await pEvent(request, 'response');
+	response.resume();
+
+	t.is(response.headers[':status'], 200);
+});