nodejs
diff --git a/‎lib/_tls_wrap.js‎
Lines changed: 2 additions & 0 deletions b/‎lib/_tls_wrap.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎lib/internal/http2/core.js‎
Lines changed: 1 addition & 1 deletion b/‎lib/internal/http2/core.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/internet/test-http2-issue-32922.js‎
Lines changed: 80 additions & 0 deletions b/‎test/internet/test-http2-issue-32922.js‎
Lines changed: 80 additions & 0 deletions
@@ -467,6 +467,7 @@ function TLSSocket(socket, opts) {
   this._securePending = false;
   this._newSessionPending = false;
   this._controlReleased = false;
+  this.secureConnecting = true;
   this._SNICallback = null;
   this.servername = null;
   this.alpnProtocol = null;
@@ -1029,6 +1030,7 @@ function onServerSocketSecure() {
 
   if (!this.destroyed && this._releaseControl()) {
     debug('server emit secureConnection');
+    this.secureConnecting = false;
     this._tlsOptions.server.emit('secureConnection', this);
   }
 }
 
@@ -1152,7 +1152,7 @@ class Http2Session extends EventEmitter {
       socket.disableRenegotiation();
 
     const setupFn = setupHandle.bind(this, socket, type, options);
-    if (socket.connecting) {
+    if (socket.connecting || socket.secureConnecting) {
       const connectEvent =
         socket instanceof tls.TLSSocket ? 'secureConnect' : 'connect';
       socket.once(connectEvent, () => {
 
@@ -0,0 +1,80 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const http2 = require('http2');
+const net = require('net');
+
+const {
+  HTTP2_HEADER_PATH,
+} = http2.constants;
+
+// Create a normal session, as a control case
+function normalSession(cb) {
+  http2.connect('https://google.com', (clientSession) => {
+    let error = null;
+    const req = clientSession.request({ [HTTP2_HEADER_PATH]: '/' });
+    req.on('error', (err) => {
+      error = err;
+    });
+    req.on('response', (_headers) => {
+      req.on('data', (_chunk) => { });
+      req.on('end', () => {
+        clientSession.close();
+        return cb(error);
+      });
+    });
+  });
+}
+normalSession(common.mustCall(function(err) {
+  assert.ifError(err);
+}));
+
+// Create a session using a socket that has not yet finished connecting
+function socketNotFinished(done) {
+  const socket2 = net.connect(443, 'google.com');
+  http2.connect('https://google.com', { socket2 }, (clientSession) => {
+    let error = null;
+    const req = clientSession.request({ [HTTP2_HEADER_PATH]: '/' });
+    req.on('error', (err) => {
+      error = err;
+    });
+    req.on('response', (_headers) => {
+      req.on('data', (_chunk) => { });
+      req.on('end', () => {
+        clientSession.close();
+        socket2.destroy();
+        return done(error);
+      });
+    });
+  });
+}
+socketNotFinished(common.mustCall(function(err) {
+  assert.ifError(err);
+}));
+
+// Create a session using a socket that has finished connecting
+function socketFinished(done) {
+  const socket = net.connect(443, 'google.com', () => {
+    http2.connect('https://google.com', { socket }, (clientSession) => {
+      let error = null;
+      const req = clientSession.request({ [HTTP2_HEADER_PATH]: '/' });
+      req.on('error', (err) => {
+        error = err;
+      });
+      req.on('response', (_headers) => {
+        req.on('data', (_chunk) => { });
+        req.on('end', () => {
+          clientSession.close();
+          return done(error);
+        });
+      });
+    });
+  });
+}
+socketFinished(common.mustCall(function(err) {
+  assert.ifError(err);
+}));
Original file line number	Diff line number	Diff line change
@@ -467,6 +467,7 @@ function TLSSocket(socket, opts) {
467	467	this._securePending = false;
468	468	this._newSessionPending = false;
469	469	this._controlReleased = false;
	470	+ this.secureConnecting = true;
470	471	this._SNICallback = null;
471	472	this.servername = null;
472	473	this.alpnProtocol = null;
@@ -1029,6 +1030,7 @@ function onServerSocketSecure() {
1029	1030
1030	1031	if (!this.destroyed && this._releaseControl()) {
1031	1032	debug('server emit secureConnection');
	1033	+ this.secureConnecting = false;
1032	1034	this._tlsOptions.server.emit('secureConnection', this);
1033	1035	}
1034	1036	}