Skip to content

(v6.x backport) src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h #14836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
3edd272
test: add common.noop, default for common.mustCall()
jasnell Mar 24, 2017
2d96b01
tools: add rule prefering common.mustNotCall()
jasnell Mar 24, 2017
ce86b8e
test: add mustCallAtLeast
refack May 9, 2017
189dc42
test: harden test-dgram-bind-shared-ports
refack May 18, 2017
a28f7a2
dns: fix `resolve` failed starts without network
XadillaX Aug 10, 2017
cb3b866
src: supply missing comments for CLI options
sam-github Apr 5, 2017
1576c09
src: use option parser for expose_internals
sam-github Apr 5, 2017
ee98df8
test: mark test-fs-read-buffer-to-string-fail as flaky
Jeyanthinath Jul 26, 2017
3f2b8a9
test: increase coverage for path.parse
tniessen Jul 24, 2017
ba411f1
path: fix win32 volume-relative paths
TimothyGu Jul 24, 2017
d75363b
path: remove unnecessary string copies
tniessen Jul 23, 2017
cbd2c77
tools: add missing #include "unicode/putil.h"
srl295 Mar 27, 2017
0f36025
timers: do not use user object call/apply
Trott May 11, 2017
c7622e1
deps: cherry-pick f5fad6d from upstream v8
danbev May 2, 2017
2914926
src: only call FatalException if not verbose
danbev May 3, 2017
9dde328
build: reduce one level of spawning in node_gyp
refack Apr 25, 2017
4072073
test: check number of message events
Trott May 20, 2017
548aba4
test: confirm callback is invoked in fs test
Trott May 20, 2017
4442a1f
test: check noop function invocations
Trott May 21, 2017
85a8d6e
test: simplify assert usage in test-stream2-basic
Trott May 21, 2017
10ad128
test: move stream2 test from pummel to parallel
Trott May 21, 2017
8fd7fcc
build: support dtrace on ARM
bradleythughes Mar 27, 2017
6ca963a
test: replace `indexOf` with `includes`
thelostone-mc May 25, 2017
b997b8f
test: use mustNotCall() in test-stream2-objects
Trott May 26, 2017
7919eee
test: use mustCall() in test-readline-interface
Trott May 27, 2017
089bd3b
test: refactor test-net-server-bind
Trott May 29, 2017
30201e5
test: add documentation for common.mustNotCall()
Trott Jun 1, 2017
7c2befc
test: refactor test-dgram-oob-buffer
Trott Jun 3, 2017
c15393c
test: check callback not invoked on lookup error
Trott Jun 4, 2017
1a95a51
test: refactor domain tests
Trott Jun 5, 2017
8033cf3
test: refactor test-fs-read-*
Trott Jun 6, 2017
bfea6b2
src: merge `fn_name` in NODE_SET_PROTOTYPE_METHOD
XadillaX Jun 8, 2017
245f6b0
test: use mustNotCall in test-http-eof-on-connect
Trott Jun 9, 2017
6f44563
test: add mustCall() to child-process test
Trott Jun 11, 2017
2f8aa88
test: use mustNotCall() in test-fs-watch
Trott Jun 10, 2017
ac99a79
v8: fix RegExp nits in v8_prof_polyfill.js
vsemozhetbyt Jun 15, 2017
10e9f45
test: make test-http(s)-set-timeout-server alike
jklepatch Jun 12, 2017
7aee51f
test: refactor test-http-set-timeout-server
Trott Jun 19, 2017
2ef11d5
test: remove needless RegExp flags
vsemozhetbyt Jun 15, 2017
29141c0
test: use string instead of RegExp in split()
vsemozhetbyt Jun 16, 2017
366d1a8
doc: add missing zlib link to stream API docs
Rob--W Jun 21, 2017
b5d763f
test: remove unnecessary Buffer import
swinston1000 Jun 21, 2017
dda959d
test: remove require('buffer') on 6 fs test files
sallen450 Jun 21, 2017
611ae1e
test: remove require('buffer') from 4 buffer tests
OriLev Jun 21, 2017
bfd296b
test: remove `require('buffer')` from 4 test files
leizongmin Jun 21, 2017
036a97c
test: remove unnecessary require('buffer').Buffer
lenakaplan Jun 21, 2017
47dd8f0
test: remove `require('buffer')` from 4 test files
XadillaX Jun 21, 2017
b801c75
build: clean up config_fips.gypi
danbev Jun 21, 2017
cb8d837
test: make http(s)-set-timeout-server more similar
jklepatch Jun 20, 2017
b9837ff
test: refactor test-tls-env-extra-ca
Trott Jun 23, 2017
e5f8141
test: refactor test-tls-invoked-queued
Trott Jun 23, 2017
3a45bde
test: skip fips tests using OpenSSL config file
danbev Jun 18, 2017
da8851c
doc: fixed formatting issue in cli docs
Jun 20, 2017
8fcae92
test: remove unneeded HandleScope usage
ezequielgarcia Jun 19, 2017
9575c97
doc: fix mistake in path.relative
tniessen Jun 25, 2017
1ae897d
doc: add gireeshpunathil to collaborators
gireeshpunathil Jun 28, 2017
92c46ff
doc: add @nodejs/documentation to CC table
vsemozhetbyt Jun 27, 2017
4542915
tools: remove comment in eslint rule
danbev Jun 27, 2017
df50e01
test: refactor test-cluster-basic
Trott Jun 25, 2017
de8c16e
doc: note that fs.futimes only works on AIX >7.1
gibfahn Jun 13, 2017
8de2eca
src: add missing new line to printed message
TimothyGu Jun 26, 2017
3cae68a
test: refactor test-child-process-send-type-error
Trott Jun 25, 2017
401f3ce
src: move crypto_bio/clienthello to crypto ns
danbev Jun 28, 2017
d133e33
lib: fix typos
BridgeAR Jun 17, 2017
5336457
test: refactor test-fs-watchfile
Trott Jun 16, 2017
5160d3d
child_process: fix handleless NODE_HANDLE handling
santigimeno May 25, 2017
259e8e4
test: remove undef NDEBUG from at-exit addons test
danbev Jun 30, 2017
d6841b3
test: replace indexOf with includes and startsWith
Jun 21, 2017
c343d91
doc: fix example in child_process.md
rus0000 Jun 16, 2017
53b707d
test: refactor test-http-invalidheaderfield
Trott Jun 30, 2017
17f3dc1
doc: add CTC members to Collaborators list
Trott May 29, 2017
c5a427f
test: refactor test-http(s)-set-timeout-server
aqrln Jun 26, 2017
03a5c5a
test,fs: delay unlink in test-regress-GH-4027.js
jaimecbernardo Jun 30, 2017
78dc4f1
test: fix require nits in some test-tls-* tests
vsemozhetbyt Jun 30, 2017
95ca4ac
doc, util, console: clarify ambiguous docs
nattelog Jul 1, 2017
0dbe822
tools: use no-use-before-define ESLint rule
vsemozhetbyt Jul 1, 2017
ca6184c
src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h
danbev Apr 25, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ rules:
no-delete-var: 2
no-undef: 2
no-unused-vars: [2, {args: none}]
no-use-before-define: [2, {classes: true,
functions: false,
variables: false}]

# Node.js and CommonJS
# http://eslint.org/docs/rules/#nodejs-and-commonjs
Expand Down
59 changes: 56 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ more information about the governance of the Node.js project, see

* [abouthiroppy](https://github.com/abouthiroppy) -
**Yuta Hiroto** <[email protected]> (he/him)
* [addaleax](https://github.com/addaleax) -
**Anna Henningsen** <[email protected]> (she/her)
* [ak239](https://github.com/ak239) -
**Aleksei Koziatinskii** <[email protected]>
* [andrasq](https://github.com/andrasq) -
Expand All @@ -256,12 +258,20 @@ more information about the governance of the Node.js project, see
**Benjamin Gruenbaum** <[email protected]>
* [bmeck](https://github.com/bmeck) -
**Bradley Farias** <[email protected]>
* [bnoordhuis](https://github.com/bnoordhuis) -
**Ben Noordhuis** <[email protected]>
* [brendanashworth](https://github.com/brendanashworth) -
**Brendan Ashworth** <[email protected]>
* [bzoz](https://github.com/bzoz) -
**Bartosz Sosnowski** <[email protected]>
* [calvinmetcalf](https://github.com/calvinmetcalf) -
**Calvin Metcalf** <[email protected]>
* [ChALkeR](https://github.com/ChALkeR) -
**Сковорода Никита Андреевич** <[email protected]> (he/him)
* [chrisdickinson](https://github.com/chrisdickinson) -
**Chris Dickinson** <[email protected]>
* [cjihrig](https://github.com/cjihrig) -
**Colin Ihrig** <[email protected]>
* [claudiorodriguez](https://github.com/claudiorodriguez) -
**Claudio Rodriguez** <[email protected]>
* [danbev](https://github.com/danbev) -
Expand All @@ -276,22 +286,36 @@ more information about the governance of the Node.js project, see
**Alexander Makarenko** <[email protected]>
* [eugeneo](https://github.com/eugeneo) -
**Eugene Ostroukhov** <[email protected]>
* [evanlucas](https://github.com/evanlucas) -
**Evan Lucas** <[email protected]> (he/him)
* [fhinkel](https://github.com/fhinkel) -
**Franziska Hinkelmann** <[email protected]>
* [firedfox](https://github.com/firedfox) -
**Daniel Wang** <[email protected]>
* [Fishrock123](https://github.com/Fishrock123) -
**Jeremiah Senkpiel** <[email protected]>
* [geek](https://github.com/geek) -
**Wyatt Preul** <[email protected]>
* [gibfahn](https://github.com/gibfahn) -
**Gibson Fahnestock** <[email protected]> (he/him)
* [gireeshpunathil](https://github.com/gireeshpunathil) -
**Gireesh Punathil** <[email protected]> (he/him)
* [iarna](https://github.com/iarna) -
**Rebecca Turner** <[email protected]>
* [imran-iq](https://github.com/imran-iq) -
**Imran Iqbal** <[email protected]>
* [imyller](https://github.com/imyller) -
**Ilkka Myller** <[email protected]>
* [indutny](https://github.com/indutny) -
**Fedor Indutny** <[email protected]>
* [isaacs](https://github.com/isaacs) -
**Isaac Z. Schlueter** <[email protected]>
* [italoacasas](https://github.com/italoacasas) -
**Italo A. Casas** <[email protected]> (he/him)
* [JacksonTian](https://github.com/JacksonTian) -
**Jackson Tian** <[email protected]>
* [jasnell](https://github.com/jasnell) -
**James M Snell** <[email protected]> (he/him)
* [jasongin](https://github.com/jasongin) -
**Jason Ginchereau** <[email protected]>
* [jbergstroem](https://github.com/jbergstroem) -
Expand All @@ -304,6 +328,8 @@ more information about the governance of the Node.js project, see
**João Reis** <[email protected]>
* [joshgav](https://github.com/joshgav) -
**Josh Gavant** <[email protected]>
* [joyeecheung](https://github.com/joyeecheung) -
**Joyee Cheung** <[email protected]> (she/her)
* [julianduque](https://github.com/julianduque) -
**Julian Duque** <[email protected]> (he/him)
* [JungMinu](https://github.com/JungMinu) -
Expand All @@ -322,22 +348,38 @@ more information about the governance of the Node.js project, see
**Aleksey Smolenchuk** <[email protected]>
* [matthewloring](https://github.com/matthewloring) -
**Matthew Loring** <[email protected]>
* [mcollina](https://github.com/mcollina) -
**Matteo Collina** <[email protected]> (he/him)
* [mhdawson](https://github.com/mhdawson) -
**Michael Dawson** <[email protected]> (he/him)
* [micnic](https://github.com/micnic) -
**Nicu Micleușanu** <[email protected]> (he/him)
* [mikeal](https://github.com/mikeal) -
**Mikeal Rogers** <[email protected]>
* [misterdjules](https://github.com/misterdjules) -
**Julien Gilli** <[email protected]>
* [monsanto](https://github.com/monsanto) -
**Christopher Monsanto** <[email protected]>
* [mscdex](https://github.com/mscdex) -
**Brian White** <[email protected]>
* [MylesBorins](https://github.com/MylesBorins) -
**Myles Borins** <[email protected]> (he/him)
* [not-an-aardvark](https://github.com/not-an-aardvark) -
**Teddy Katz** <[email protected]>
* [ofrobots](https://github.com/ofrobots) -
**Ali Ijaz Sheikh** <[email protected]>
* [Olegas](https://github.com/Olegas) -
**Oleg Elifantiev** <[email protected]>
* [orangemocha](https://github.com/orangemocha) -
**Alexis Campailla** <[email protected]>
* [othiym23](https://github.com/othiym23) -
**Forrest L Norvell** <[email protected]> (he/him)
* [petkaantonov](https://github.com/petkaantonov) -
**Petka Antonov** <[email protected]>
* [phillipj](https://github.com/phillipj) -
**Phillip Johnsen** <[email protected]>
* [piscisaureus](https://github.com/piscisaureus) -
**Bert Belder** <[email protected]>
* [pmq20](https://github.com/pmq20) -
**Minqi Pan** <[email protected]>
* [princejwesley](https://github.com/princejwesley) -
Expand All @@ -360,6 +402,8 @@ more information about the governance of the Node.js project, see
**Ron Korving** <[email protected]>
* [RReverser](https://github.com/RReverser) -
**Ingvar Stepanyan** <[email protected]>
* [rvagg](https://github.com/rvagg) -
**Rod Vagg** <[email protected]>
* [saghul](https://github.com/saghul) -
**Saúl Ibarra Corretgé** <[email protected]>
* [sam-github](https://github.com/sam-github) -
Expand All @@ -368,14 +412,20 @@ more information about the governance of the Node.js project, see
**Santiago Gimeno** <[email protected]>
* [seishun](https://github.com/seishun) -
**Nikolai Vavilov** <[email protected]>
* [shigeki](https://github.com/shigeki) -
**Shigeki Ohtsu** <[email protected]> (he/him)
* [silverwind](https://github.com/silverwind) -
**Roman Reiss** <[email protected]>
* [srl295](https://github.com/srl295) -
**Steven R Loomis** <[email protected]>
* [stefanmb](https://github.com/stefanmb) -
**Stefan Budeanu** <[email protected]>
* [targos](https://github.com/targos) -
**Michaël Zasso** <[email protected]> (he/him)
* [tellnes](https://github.com/tellnes) -
**Christian Tellnes** <[email protected]>
* [thefourtheye](https://github.com/thefourtheye) -
**Sakthipriyan Vairamani** <[email protected]> (he/him)
* [thekemkid](https://github.com/thekemkid) -
**Glen Keane** <[email protected]> (he/him)
* [thlorenz](https://github.com/thlorenz) -
Expand All @@ -384,6 +434,10 @@ more information about the governance of the Node.js project, see
**Timothy Gu** <[email protected]> (he/him)
* [tniessen](https://github.com/tniessen) -
**Tobias Nießen** <[email protected]>
* [trevnorris](https://github.com/trevnorris) -
**Trevor Norris** <[email protected]>
* [Trott](https://github.com/Trott) -
**Rich Trott** <[email protected]> (he/him)
* [tunniclm](https://github.com/tunniclm) -
**Mike Tunnicliffe** <[email protected]>
* [vkurchatkin](https://github.com/vkurchatkin) -
Expand All @@ -399,9 +453,8 @@ more information about the governance of the Node.js project, see
* [yosuke-furukawa](https://github.com/yosuke-furukawa) -
**Yosuke Furukawa** <[email protected]>

Collaborators (which includes CTC members) follow the
[COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in maintaining the Node.js
project.
Collaborators follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in
maintaining the Node.js project.

### Release Team

Expand Down
10 changes: 7 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import nodedownload
# imports in tools/
sys.path.insert(0, os.path.join(root_dir, 'tools'))
import getmoduleversion
from gyp_node import run_gyp

# parse our options
parser = optparse.OptionParser()
Expand Down Expand Up @@ -972,7 +973,10 @@ def configure_openssl(o):
]
else:
o['variables']['openssl_fips'] = ''

try:
os.remove('config_fips.gypi')
except OSError:
pass

if options.without_ssl:
def without_ssl_error(option):
Expand Down Expand Up @@ -1370,7 +1374,7 @@ config = '\n'.join(map('='.join, config.iteritems())) + '\n'

write('config.mk', do_not_edit + config)

gyp_args = [sys.executable, 'tools/gyp_node.py', '--no-parallel']
gyp_args = ['--no-parallel']

if options.use_xcode:
gyp_args += ['-f', 'xcode']
Expand All @@ -1389,4 +1393,4 @@ gyp_args += args
if warn.warned:
warn('warnings were emitted in the configure phase')

sys.exit(subprocess.call(gyp_args))
run_gyp(gyp_args)
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 5
#define V8_MINOR_VERSION 1
#define V8_BUILD_NUMBER 281
#define V8_PATCH_LEVEL 104
#define V8_PATCH_LEVEL 105

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
5 changes: 5 additions & 0 deletions deps/v8/include/v8.h
Original file line number Diff line number Diff line change
Expand Up @@ -6869,6 +6869,11 @@ class V8_EXPORT TryCatch {
*/
void SetVerbose(bool value);

/**
* Returns true if verbosity is enabled.
*/
bool IsVerbose() const;

/**
* Set whether or not this TryCatch should capture a Message object
* which holds source information about where the exception
Expand Down
4 changes: 4 additions & 0 deletions deps/v8/src/api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2395,6 +2395,10 @@ void v8::TryCatch::SetVerbose(bool value) {
is_verbose_ = value;
}

bool v8::TryCatch::IsVerbose() const {
return is_verbose_;
}


void v8::TryCatch::SetCaptureMessage(bool value) {
capture_message_ = value;
Expand Down
2 changes: 1 addition & 1 deletion doc/api/child_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ grep.on('close', (code) => {
```


Example of checking for failed exec:
Example of checking for failed `spawn`:

```js
const spawn = require('child_process').spawn;
Expand Down
2 changes: 1 addition & 1 deletion doc/api/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ added: v6.11.0

Load an OpenSSL configuration file on startup. Among other uses, this can be
used to enable FIPS-compliant crypto if Node.js is built with `./configure
\-\-openssl\-fips`.
--openssl-fips`.

If the [`--openssl-config`][] command line option is used, the environment
variable is ignored.
Expand Down
4 changes: 1 addition & 3 deletions doc/api/console.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,7 @@ console.log('count:', count);
// Prints: count: 5, to stdout
```

If formatting elements (e.g. `%d`) are not found in the first string then
[`util.inspect()`][] is called on each argument and the resulting string
values are concatenated. See [`util.format()`][] for more information.
See [`util.format()`][] for more information.

### console.time(label)
<!-- YAML
Expand Down
3 changes: 3 additions & 0 deletions doc/api/fs.md
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,9 @@ added: v0.4.2
Change the file timestamps of a file referenced by the supplied file
descriptor.

*Note*: This function does not work on AIX versions before 7.1, it will return
the error `UV_ENOSYS`.

## fs.futimesSync(fd, atime, mtime)
<!-- YAML
added: v0.4.2
Expand Down
2 changes: 1 addition & 1 deletion doc/api/path.md
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb');
// Returns: '..\\..\\impl\\bbb'
```

A [`TypeError`][] is thrown if neither `from` nor `to` is a string.
A [`TypeError`][] is thrown if either `from` or `to` is not a string.

## path.resolve([...paths])
<!-- YAML
Expand Down
1 change: 1 addition & 0 deletions doc/api/stream.md
Original file line number Diff line number Diff line change
Expand Up @@ -2060,6 +2060,7 @@ readable buffer so there is nothing for a user to consume.
[HTTP responses, on the server]: http.html#http_class_http_serverresponse
[http-incoming-message]: http.html#http_class_http_incomingmessage
[Readable]: #stream_class_stream_readable
[zlib]: zlib.html
[stream-_flush]: #stream_transform_flush_callback
[stream-_read]: #stream_readable_read_size_1
[stream-_transform]: #stream_transform_transform_chunk_encoding_callback
Expand Down
11 changes: 6 additions & 5 deletions doc/api/util.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,17 @@ util.format('%s:%s', 'foo');
// Returns: 'foo:%s'
```

If there are more arguments passed to the `util.format()` method than the
number of placeholders, the extra arguments are coerced into strings (for
objects and symbols, `util.inspect()` is used) then concatenated to the
returned string, each delimited by a space.
If there are more arguments passed to the `util.format()` method than the number
of placeholders, the extra arguments are coerced into strings then concatenated
to the returned string, each delimited by a space. Excessive arguments whose
`typeof` is `'object'` or `'symbol'` (except `null`) will be transformed by
`util.inspect()`.

```js
util.format('%s:%s', 'foo', 'bar', 'baz'); // 'foo:bar baz'
```

If the first argument is not a format string then `util.format()` returns
If the first argument is not a string then `util.format()` returns
a string that is the concatenation of all arguments separated by spaces.
Each argument is converted to a string using `util.inspect()`.

Expand Down
1 change: 1 addition & 0 deletions doc/onboarding-extras.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
| --- | --- |
| `benchmark/*` | @nodejs/benchmarking, @mscdex |
| `bootstrap_node.js` | @fishrock123 |
| `doc/*`, `*.md` | @nodejs/documentation |
| `lib/assert` | @nodejs/testing |
| `lib/buffer` | @nodejs/buffer |
| `lib/child_process` | @bnoordhuis, @cjihrig |
Expand Down
3 changes: 2 additions & 1 deletion lib/_debugger.js
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,8 @@ Interface.prototype.debugEval = function(code, context, filename, callback) {
return;
}

var frame = client.currentFrame === NO_FRAME ? frame : undefined;
var frame = client.currentFrame;
if (frame !== NO_FRAME) frame = undefined;

self.pause();

Expand Down
6 changes: 3 additions & 3 deletions lib/_tls_wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ TLSSocket.prototype._init = function(socket, wrap) {

// lib/net.js expect this value to be non-zero if write hasn't been flushed
// immediately
// TODO(indutny): rewise this solution, it might be 1 before handshake and
// TODO(indutny): revise this solution, it might be 1 before handshake and
// represent real writeQueueSize during regular writes.
ssl.writeQueueSize = 1;

Expand Down Expand Up @@ -705,7 +705,7 @@ TLSSocket.prototype.getProtocol = function() {
// outcomes:
//
// A) verifyError returns null meaning the client's certificate is signed
// by one of the server's CAs. The server know's the client idenity now
// by one of the server's CAs. The server now knows the client's identity
// and the client is authorized.
//
// B) For some reason the client's certificate is not acceptable -
Expand Down Expand Up @@ -984,7 +984,7 @@ function normalizeConnectArgs(listArgs) {
var cb = args[1];

// If args[0] was options, then normalize dealt with it.
// If args[0] is port, or args[0], args[1] is host,port, we need to
// If args[0] is port, or args[0], args[1] is host, port, we need to
// find the options and merge them in, normalize's options has only
// the host/port/path args that it knows about, not the tls options.
// This means that options.host overrides a host arg.
Expand Down
4 changes: 2 additions & 2 deletions lib/buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function alignPool() {
}

/**
* The Buffer() construtor is "soft deprecated" ... that is, it is deprecated
* The Buffer() constructor is "soft deprecated" ... that is, it is deprecated
* in the documentation and should not be used moving forward. Rather,
* developers should use one of the three new factory APIs: Buffer.from(),
* Buffer.allocUnsafe() or Buffer.alloc() based on their specific needs. There
Expand Down Expand Up @@ -124,7 +124,7 @@ Buffer.alloc = function(size, fill, encoding) {
// Since we are filling anyway, don't zero fill initially.
// Only pay attention to encoding if it's a string. This
// prevents accidentally sending in a number that would
// be interpretted as a start offset.
// be interpreted as a start offset.
if (typeof encoding !== 'string')
encoding = undefined;
return createUnsafeBuffer(size).fill(fill, encoding);
Expand Down
Loading