http2: set origin name correctly when servername is empty

Fixes: #39919 Refs: #39934 PR-URL: #42838 Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
nodejs · May 30, 2022 · b187060 · b187060
1 parent 3e1ed1e
commit b187060
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -3119,7 +3119,7 @@ function initializeTLSOptions(options, servername) {
   options.ALPNProtocols = ['h2'];
   if (options.allowHTTP1 === true)
     ArrayPrototypePush(options.ALPNProtocols, 'http/1.1');
-  if (servername !== undefined && options.servername === undefined)
+  if (servername !== undefined && !options.servername)
     options.servername = servername;
   return options;
 }

diff --git a/test/parallel/test-http2-create-client-secure-session.js b/test/parallel/test-http2-create-client-secure-session.js
@@ -91,3 +91,9 @@ verifySecureSession(
   loadKey('agent1-cert.pem'),
   loadKey('ca1-cert.pem'),
   { servername: 'agent1' });
+
+verifySecureSession(
+  loadKey('agent8-key.pem'),
+  loadKey('agent8-cert.pem'),
+  loadKey('fake-startcom-root-cert.pem'),
+  { servername: '' });