summaryrefslogtreecommitdiff
path: root/lib/_tls_wrap.js
diff options
context:
space:
mode:
authorRuslan Bekenev <furyinbox@gmail.com>2017-05-02 20:36:50 +0300
committerAnna Henningsen <anna@addaleax.net>2017-05-15 19:56:33 +0200
commitb23d414c7ec0674ba3cbb36427e4c29dbd396338 (patch)
treec744f992ced5612f70344067988ab3396c8265ed /lib/_tls_wrap.js
parentef16319effe396622666268cd8100ad8d586c4ee (diff)
downloadandroid-node-v8-b23d414c7ec0674ba3cbb36427e4c29dbd396338.tar.gz
android-node-v8-b23d414c7ec0674ba3cbb36427e4c29dbd396338.tar.bz2
android-node-v8-b23d414c7ec0674ba3cbb36427e4c29dbd396338.zip
tls: do not wrap net.Socket with StreamWrap
Fixes: https://github.com/nodejs/node/issues/3655 PR-URL: https://github.com/nodejs/node/pull/12799 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'lib/_tls_wrap.js')
-rw-r--r--lib/_tls_wrap.js9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 511ff3557a..b8a962e734 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -31,7 +31,6 @@ const util = require('util');
const common = require('_tls_common');
const StreamWrap = require('_stream_wrap').StreamWrap;
const Buffer = require('buffer').Buffer;
-const Duplex = require('stream').Duplex;
const debug = util.debuglog('tls');
const Timer = process.binding('timer_wrap').Timer;
const tls_wrap = process.binding('tls_wrap');
@@ -275,12 +274,10 @@ function TLSSocket(socket, options) {
// Wrap plain JS Stream into StreamWrap
var wrap;
- if (!(socket instanceof net.Socket) && socket instanceof Duplex)
- wrap = new StreamWrap(socket);
- else if ((socket instanceof net.Socket) && !socket._handle)
- wrap = new StreamWrap(socket);
- else
+ if ((socket instanceof net.Socket && socket._handle) || !socket)
wrap = socket;
+ else
+ wrap = new StreamWrap(socket);
// Just a documented property to make secure sockets
// distinguishable from regular ones.