summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames M Snell <jasnell@gmail.com>2017-11-24 12:43:05 -0800
committerJames M Snell <jasnell@gmail.com>2017-11-28 10:30:25 -0800
commitf3686f2a4dc017d998a057f7fa6107e36a721641 (patch)
tree52cf5cb06c5fd4340a6d8dbd70c28d2ea91114c2 /lib
parent0fb1e0768945fa5f4d232a77e3303d1e25e89a5f (diff)
downloadandroid-node-v8-f3686f2a4dc017d998a057f7fa6107e36a721641.tar.gz
android-node-v8-f3686f2a4dc017d998a057f7fa6107e36a721641.tar.bz2
android-node-v8-f3686f2a4dc017d998a057f7fa6107e36a721641.zip
http2: use correct connect event for TLS Socket
PR-URL: https://github.com/nodejs/node/pull/17328 Fixes: https://github.com/nodejs/node/issues/15303 Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/internal/http2/core.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 39f67c4823..d00ed60441 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -707,7 +707,9 @@ class Http2Session extends EventEmitter {
const setupFn = setupHandle(this, socket, type, options);
if (socket.connecting) {
this[kState].connecting = true;
- socket.once('connect', setupFn);
+ const connectEvent =
+ socket instanceof tls.TLSSocket ? 'secureConnect' : 'connect';
+ socket.once(connectEvent, setupFn);
} else {
setupFn();
}