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/‎test/parallel/test-http2-connect.js‎
Lines changed: 33 additions & 1 deletion b/‎test/parallel/test-http2-connect.js‎
Lines changed: 33 additions & 1 deletion
@@ -1512,11 +1512,13 @@ function onConnectSecure() {
       debug('client emit secureConnect. rejectUnauthorized: %s, ' +
             'authorizationError: %s', options.rejectUnauthorized,
             this.authorizationError);
+      this.secureConnecting = false;
       this.emit('secureConnect');
     }
   } else {
     this.authorized = true;
     debug('client emit secureConnect. authorized:', this.authorized);
+    this.secureConnecting = false;
     this.emit('secureConnect');
   }
 
 
@@ -9,9 +9,11 @@ const {
 } = require('../common');
 if (!hasCrypto)
   skip('missing crypto');
+const fixtures = require('../common/fixtures');
 const assert = require('assert');
-const { createServer, connect } = require('http2');
+const { createServer, createSecureServer, connect } = require('http2');
 const { connect: netConnect } = require('net');
+const { connect: tlsConnect } = require('tls');
 
 // Check for session connect callback and event
 {
@@ -70,6 +72,36 @@ const { connect: netConnect } = require('net');
   connect(authority).on('error', () => {});
 }
 
+// Check for session connect callback on already connected TLS socket
+{
+  const serverOptions = {
+    key: fixtures.readKey('agent1-key.pem'),
+    cert: fixtures.readKey('agent1-cert.pem')
+  };
+  const server = createSecureServer(serverOptions);
+  server.listen(0, mustCall(() => {
+    const { port } = server.address();
+
+    const onSocketConnect = () => {
+      const authority = `https://localhost:${port}`;
+      const createConnection = mustCall(() => socket);
+      const options = { createConnection };
+      connect(authority, options, mustCall(onSessionConnect));
+    };
+
+    const onSessionConnect = (session) => {
+      session.close();
+      server.close();
+    };
+
+    const clientOptions = {
+      port,
+      rejectUnauthorized: false
+    };
+    const socket = tlsConnect(clientOptions, mustCall(onSocketConnect));
+  }));
+}
+
 // Check for error for init settings error
 {
   createServer(function() {
Original file line number	Diff line number	Diff line change
@@ -1512,11 +1512,13 @@ function onConnectSecure() {
1512	1512	debug('client emit secureConnect. rejectUnauthorized: %s, ' +
1513	1513	'authorizationError: %s', options.rejectUnauthorized,
1514	1514	this.authorizationError);
	1515	+ this.secureConnecting = false;
1515	1516	this.emit('secureConnect');
1516	1517	}
1517	1518	} else {
1518	1519	this.authorized = true;
1519	1520	debug('client emit secureConnect. authorized:', this.authorized);
	1521	+ this.secureConnecting = false;
1520	1522	this.emit('secureConnect');
1521	1523	}
1522	1524