diff options
author | James M Snell <jasnell@gmail.com> | 2018-08-15 17:14:22 -0700 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2018-08-19 12:46:10 -0700 |
commit | 884b23daf723db60ebe939e6dde492fa5f9230eb (patch) | |
tree | feb159647324b4fd00024d72ea464cd4cbe161ab /lib | |
parent | 7108893ec8fb3b3ee8538c82640fa61ac7014e38 (diff) | |
download | android-node-v8-884b23daf723db60ebe939e6dde492fa5f9230eb.tar.gz android-node-v8-884b23daf723db60ebe939e6dde492fa5f9230eb.tar.bz2 android-node-v8-884b23daf723db60ebe939e6dde492fa5f9230eb.zip |
stream: move process.binding('stream_wrap') to internalBinding
PR-URL: https://github.com/nodejs/node/pull/22345
Refs: https://github.com/nodejs/node/issues/22160
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/internal/bootstrap/node.js | 7 | ||||
-rw-r--r-- | lib/internal/child_process.js | 2 | ||||
-rw-r--r-- | lib/internal/http2/core.js | 2 | ||||
-rw-r--r-- | lib/internal/stream_base_commons.js | 3 | ||||
-rw-r--r-- | lib/net.js | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 32a62171da..661b1eb380 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -344,7 +344,12 @@ // that are whitelisted for access via process.binding()... this is used // to provide a transition path for modules that are being moved over to // internalBinding. - const internalBindingWhitelist = new SafeSet(['uv', 'http_parser', 'v8']); + const internalBindingWhitelist = + new SafeSet([ + 'uv', + 'http_parser', + 'v8', + 'stream_wrap']); process.binding = function binding(name) { return internalBindingWhitelist.has(name) ? internalBinding(name) : diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js index d212bbeaa7..cf7e23bf7a 100644 --- a/lib/internal/child_process.js +++ b/lib/internal/child_process.js @@ -24,7 +24,7 @@ const assert = require('assert'); const { internalBinding } = require('internal/bootstrap/loaders'); const { Process } = process.binding('process_wrap'); -const { WriteWrap } = process.binding('stream_wrap'); +const { WriteWrap } = internalBinding('stream_wrap'); const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap'); const { TTY } = process.binding('tty_wrap'); const { TCP } = process.binding('tcp_wrap'); diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index 2999494813..c0c452a35f 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -115,7 +115,7 @@ const { isArrayBufferView } = require('internal/util/types'); const { FileHandle } = process.binding('fs'); const binding = internalBinding('http2'); -const { ShutdownWrap } = process.binding('stream_wrap'); +const { ShutdownWrap } = internalBinding('stream_wrap'); const { UV_EOF } = internalBinding('uv'); const { StreamPipe } = internalBinding('stream_pipe'); diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js index b252b1d8ff..9bd2dd90bc 100644 --- a/lib/internal/stream_base_commons.js +++ b/lib/internal/stream_base_commons.js @@ -2,7 +2,8 @@ const { Buffer } = require('buffer'); const errors = require('internal/errors'); -const { WriteWrap } = process.binding('stream_wrap'); +const { internalBinding } = require('internal/bootstrap/loaders'); +const { WriteWrap } = internalBinding('stream_wrap'); const errnoException = errors.errnoException; diff --git a/lib/net.js b/lib/net.js index b7b91a71f1..428675173f 100644 --- a/lib/net.js +++ b/lib/net.js @@ -43,7 +43,7 @@ const { const { Buffer } = require('buffer'); const TTYWrap = process.binding('tty_wrap'); -const { ShutdownWrap } = process.binding('stream_wrap'); +const { ShutdownWrap } = internalBinding('stream_wrap'); const { TCP, TCPConnectWrap, |