From e785e6621096fc6e9384982ef9f1c251296e875e Mon Sep 17 00:00:00 2001
From: Pieter Mees <pieter.mees@zentrick.com>
Date: Fri, 6 Apr 2018 17:42:24 -0400
Subject: [PATCH 1/3] doc: add Http2Session.connecting property

---
 doc/api/http2.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/api/http2.md b/doc/api/http2.md
index 094dca2582fd92..37a806e8bdae00 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -320,6 +320,17 @@ added: v9.4.0
 Will be `true` if this `Http2Session` instance has been closed, otherwise
 `false`.
 
+#### http2session.connecting
+<!-- YAML
+added: REPLACEME
+-->
+
+* {boolean}
+
+Will be `true` if this `Http2Session` instance is still connecting, will be set
+to `false` before emitting `connect` event and/or calling the `http2.connect`
+callback.
+
 #### http2session.destroy([error,][code])
 <!-- YAML
 added: v8.4.0

From 29036ab39316a64ba9fbc9ed0454f463d3219f65 Mon Sep 17 00:00:00 2001
From: Pieter Mees <pieter.mees@zentrick.com>
Date: Mon, 9 Apr 2018 15:19:59 -0400
Subject: [PATCH 2/3] http2: emit session connect on next tick

---
 lib/internal/http2/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 8005d7941a6df3..0aa9904001a340 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -774,7 +774,7 @@ function setupHandle(socket, type, options) {
   // core will check for session.destroyed before progressing, this
   // ensures that those at l`east get cleared out.
   if (this.destroyed) {
-    this.emit('connect', this, socket);
+    process.nextTick(emit, this, 'connect', this, socket);
     return;
   }
   debug(`Http2Session ${sessionName(type)}: setting up session handle`);
@@ -816,7 +816,7 @@ function setupHandle(socket, type, options) {
     options.settings : {};
 
   this.settings(settings);
-  this.emit('connect', this, socket);
+  process.nextTick(emit, this, 'connect', this, socket);
 }
 
 // Emits a close event followed by an error event if err is truthy. Used

From e9f09bd5f1f15a46e2410c4b9e19341f1c5eff2e Mon Sep 17 00:00:00 2001
From: Pieter Mees <pieter.mees@zentrick.com>
Date: Mon, 9 Apr 2018 15:14:29 -0400
Subject: [PATCH 3/3] test: add test for http2 session connect callback on
 already connected socket

---
 test/parallel/test-http2-connect.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/test/parallel/test-http2-connect.js b/test/parallel/test-http2-connect.js
index 9b628db5aeebaa..252efa1229ad85 100644
--- a/test/parallel/test-http2-connect.js
+++ b/test/parallel/test-http2-connect.js
@@ -4,6 +4,9 @@ const { mustCall, hasCrypto, skip, expectsError } = require('../common');
 if (!hasCrypto)
   skip('missing crypto');
 const { createServer, connect } = require('http2');
+const { connect: netConnect } = require('net');
+
+// check for session connect callback and event
 {
   const server = createServer();
   server.listen(0, mustCall(() => {
@@ -30,6 +33,28 @@ const { createServer, connect } = require('http2');
   }));
 }
 
+// check for session connect callback on already connected socket
+{
+  const server = createServer();
+  server.listen(0, mustCall(() => {
+    const { port } = server.address();
+
+    const onSocketConnect = () => {
+      const authority = `http://localhost:${port}`;
+      const createConnection = mustCall(() => socket);
+      const options = { createConnection };
+      connect(authority, options, mustCall(onSessionConnect));
+    };
+
+    const onSessionConnect = (session) => {
+      session.close();
+      server.close();
+    };
+
+    const socket = netConnect(port, mustCall(onSocketConnect));
+  }));
+}
+
 // check for https as protocol
 {
   const authority = 'https://localhost';