Skip to content
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

v8.9.2 proposal #17204

Merged
merged 110 commits into from
Dec 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
9df1e8f
console: avoid adding infinite error listeners
mcollina Nov 5, 2017
47b1c3b
test: add test for WrapStream readStop
akaila Oct 21, 2017
255fffb
src: do not include x.h if x-inl.h is included
joyeecheung Oct 30, 2017
a2fd9a3
doc: add *-inl.h include rule to C++ style guide
joyeecheung Oct 27, 2017
cecd1e3
src: fix etw provider include on Windows
joyeecheung Oct 31, 2017
981a1ef
test: use ES6 classes instead of util.inherits
tniessen Nov 10, 2017
d27ec13
repl: avoid crashing from null and undefined errors
priyank-p Oct 28, 2017
d2e4a87
doc: howto decode buffers extending from Writable
dicearr Oct 23, 2017
2f66faf
test: use fixtures module in test-https-pfx
t-k-g Oct 6, 2017
79e1d77
src: remove unused includes in string_bytes.h
danbev Oct 30, 2017
4e848d4
build: add missing comma in sources list
danbev Oct 30, 2017
b3032d2
test: increase coverage for ModuleMap
robtpaton Oct 6, 2017
72c34cf
test,net: remove scatological terminology
Trott Oct 30, 2017
82076ed
src: pass context to Get() operations for cares_wrap
evanlucas Oct 31, 2017
13866b8
doc: add windowsVerbatimArguments docs
Oct 18, 2017
542f3b9
doc: add details about rss on process.memoryUsage
profnandaa Oct 27, 2017
1bf6250
doc : mention constant-time in crypto doc
mithunsasidharan Oct 30, 2017
1e8a421
test: pause child until parent is ready
jBarz Oct 4, 2017
a41cc02
test: fix flaky test-http2-server-rst-stream.js
apapirovski Nov 2, 2017
d9a18be
build: suppress lint-md output
gibfahn Oct 27, 2017
2cc05e0
doc: add nodejs/gyp team for GYP related issues
gibfahn Oct 31, 2017
57b377e
src: improve module loader readability
addaleax Oct 26, 2017
c52ac92
test: fix malformed parallel.status line
Trott Nov 3, 2017
7618567
doc: add docs for Zlib#close()
lpinca Oct 29, 2017
8cf8a32
http2: refactor settings handling
jasnell Nov 1, 2017
6583016
http2: improve errors thrown in header validation
joyeecheung Nov 3, 2017
9b8e2a6
http: use arrow fns for lexical `this` in Agent
bengl Oct 25, 2017
3319b20
doc: update license to include node-inspect
MylesBorins Nov 1, 2017
480f14a
test: update test to use fixtures
awegrzyn Nov 6, 2017
7b14917
test: replace `common.fixturesDir` usage
sastan Nov 6, 2017
40fa970
tools: replace string concetation with templates
Nov 6, 2017
1e6845d
test: replace common.fixturesDir with fixtures.readSync()
AdriVanHoudt Nov 6, 2017
0fa659c
test: replace common.fixturesDir with fixtures module
doomhz Nov 6, 2017
aaf7e83
tools: replace string concatenation with template literals
lambrojos Nov 6, 2017
af13678
test: clarified assert message for test-require-json.js
matthias-reis Nov 6, 2017
c4176eb
test: replace fixturesDir with usage of fixtures module
itavy Nov 6, 2017
60c918a
tools: replace string concatenation with template literals
kevinwcyu Nov 6, 2017
b166b6b
test: fix typos in read-buffer tests
jimivdw Nov 6, 2017
cb08f5d
tools: remove unneeded parentheses in doc/html.js
vsemozhetbyt Nov 6, 2017
5719bea
test: update test to use fixtures.readKey
Nov 6, 2017
b307582
test: use fixtures module in test-repl
DamianLion Nov 6, 2017
33f2fff
test: refactor tls test to use fixtres.readSync
brianoconnell Nov 6, 2017
f2a9c02
doc: fix json generator warnings
lpinca Nov 4, 2017
2bbc76e
test: include file mode in assert message
sastan Nov 6, 2017
0ebded4
test: show incorrect value on test failure
Nov 6, 2017
562d8fc
test: remove custom message from assertion
Marsup Nov 6, 2017
ec4c3f5
test: improve message in test-fs-readfile-pipe-large
keldorus Nov 6, 2017
fab5598
doc: add isTTY property documentation
sonaysevik Nov 6, 2017
ca27880
test: use default assertion message
jonask-wix Nov 6, 2017
eafc0a1
doc: fix a link in dgram.md
vsemozhetbyt Nov 7, 2017
71c11d6
test: improve assert messages in test-global
markmcnelis Nov 6, 2017
4fcb03c
test: move test-http-keepalive-maxsockets to sequential
Trott Nov 5, 2017
d64fe48
test: check session timeout in http2
apapirovski Nov 4, 2017
2f1f7e1
test: remove message argument in cluster setup test
mbornath Nov 6, 2017
8d31294
src: CHECK() for argument overflow in Spawn()
cjihrig Nov 4, 2017
c4634bf
doc: update subprocess.killed
cjihrig Nov 4, 2017
360f403
doc: fix typo in assert.md
mjomble Nov 7, 2017
c1309d6
test: use tmpDir in test-fs-utimes
Trott Nov 5, 2017
79006da
tools: don't lint files that have not changed
joyeecheung Oct 29, 2017
e66a7ae
test: replace common.fixtiresDir with fixtures.readKey()
wsierakowski Nov 6, 2017
1b1bd26
test: add values to error message
intercity-technology Nov 6, 2017
8538354
tools: add direct anchors for error codes
joyeecheung Nov 5, 2017
7c9aee3
test: improve assertion in test-require-dot
awegrzyn Nov 6, 2017
0bc16cd
test: improve assert messages in stream test
katie-roberts Nov 8, 2017
585f869
build: include src\tracing when linting on win
danbev Nov 3, 2017
d721c0b
doc: improve documentation for the vm module
fhinkel Nov 7, 2017
1522562
test: pass process.env to child processes
rvagg Oct 23, 2017
adb8f08
doc: fix a typo in the documentation
mamatha-jv Nov 10, 2017
7ba0375
deps: cherry-pick cc55747 from V8 upstream
fhinkel Nov 8, 2017
6c57399
test: improve assertion messages
Nov 8, 2017
26d529e
test: cover vm.runInNewContext()
cjihrig Nov 9, 2017
0d4f62c
tools,build: allow build without `remark-cli`
refack Nov 8, 2017
f7411b5
src: make StreamBase prototype accessors robust
joyeecheung Nov 7, 2017
0b8a400
doc: correct the spelling of omitting in dgram.md
vidyasubramanyam Nov 10, 2017
be920aa
test: replace string concatenation with template
tanvikini Nov 10, 2017
41f905b
test: replace string concatenation with template
Nov 10, 2017
81a6c4f
test: enable mustCall() during child exit
vipinmenon Nov 10, 2017
ae7106c
test: replace string concatenation with template
imkabir Nov 10, 2017
134c2f3
lib: replace string concatenation with template
subbachari Nov 10, 2017
7164d9a
test: use template string for concatenation
vipinmenon Nov 10, 2017
febd1bf
test: change string concatenation to template
narkedi Nov 10, 2017
6eb550d
doc: remove duplicate 'the' from http2 API doc
vipinmenon Nov 10, 2017
28f0360
lib: change concatenated string to template
Nayanadask Nov 10, 2017
7168a7e
test: change concatenated string to template
Anaweshak Nov 10, 2017
6e7a444
doc: outline commit message for breaking changes
MatonAnthony Nov 6, 2017
bf9eb04
test: change concatenated string to template
deesebas Nov 10, 2017
2ad051d
lib: change concatenated string to template
pajangid Nov 10, 2017
8f0793f
doc: clarify the prerequisites for building with VS2017
seishun Nov 9, 2017
4088089
src: use unrefed async for GC tracking
addaleax Nov 4, 2017
c3e6491
test: unmark flaky test
addaleax Nov 4, 2017
3a3792b
test: improve template value for test message
d1b1 Nov 6, 2017
af8b17a
test: use common/fixtures module in hash-seed test
Nov 6, 2017
dc14c25
loader: test search module
clakech Nov 6, 2017
29efb02
http2: multiple smaller code cleanups
jasnell Nov 4, 2017
ccd3646
doc: reorganize COLLABORATOR_GUIDE.md
Trott Oct 1, 2017
4f587e5
test: add a test description
grantgasp Nov 6, 2017
5c8fb6a
test: refactor fs.write() test
Nov 6, 2017
85fd7bb
tools: fix inspector-check reporting
danbev Oct 23, 2017
14f8cee
lib: guard inspector console using process var
danbev Sep 25, 2017
4faf2ec
lib: replace string concatenation with template
narkedi Nov 10, 2017
315fba8
test: used fixturesDir from fixtures modules
Nov 6, 2017
891ddad
doc: fix typo in http2 doc
devsnek Nov 13, 2017
c3c9a8d
doc: recommend node-core-utils for metadata
Trott Nov 13, 2017
57937e5
tools: remove unused trailing function arguments
Trott Nov 9, 2017
2b903bf
tools: enforce no unused trailing arguments tools directory
Trott Nov 9, 2017
6ab706d
test: refactor comments in test-child-process-spawnsync-maxbuf
chrbergert Nov 6, 2017
375bec0
test: use fixtures module for path resolve
sercanyersen Nov 6, 2017
efdd7c8
test: reuse existing PassThrough implementation
tniessen Nov 10, 2017
dcb2644
2017-12-05, Version 8.9.2 'Carbon' (LTS)
gibfahn Nov 21, 2017
cf9b557
Working on v8.9.3
gibfahn Dec 5, 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
8 changes: 5 additions & 3 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,11 @@ Prerequisites:
* [Visual Studio 2015 Update 3](https://www.visualstudio.com/), all editions
including the Community edition (remember to select
"Common Tools for Visual C++ 2015" feature during installation).
* [Visual Studio 2017](https://www.visualstudio.com/downloads/), any edition (including the Build Tools SKU).
**Required Components:** "MSbuild", "VC++ 2017 v141 toolset" and at least one of the Windows SDKs.
*Note*: For "Windows 10 SDK (10.0.15063.0)" only the "Desktop C++ x86 and x64" flavor is required.
* The "Desktop development with C++" workload from
[Visual Studio 2017](https://www.visualstudio.com/downloads/) or the
"Visual C++ build tools" workload from the
[Build Tools](https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017),
with the default optional components.
* Basic Unix tools required for some tests,
[Git for Windows](http://git-scm.com/download/win) includes Git Bash
and tools which can be included in the global `PATH`.
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.9.1">8.9.1</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.9.2">8.9.2</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.9.1">8.9.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.9.0">8.9.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.8.1">8.8.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.8.0">8.8.0</a><br/>
Expand Down
59 changes: 31 additions & 28 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -371,60 +371,45 @@ The TSC should serve as the final arbiter where required.
* If more than one author has contributed to the PR, keep the most recent
author when squashing.

Always modify the original commit message to include additional meta
information regarding the change process:

- A `PR-URL:` line that references the *full* GitHub URL of the original
pull request being merged so it's easy to trace a commit back to the
conversation that led up to that change.
- A `Fixes: X` line, where _X_ either includes the *full* GitHub URL
for an issue, and/or the hash and commit message if the commit fixes
a bug in a previous commit. Multiple `Fixes:` lines may be added if
appropriate.
- A `Refs:` line referencing a URL for any relevant background.
- A `Reviewed-By: Name <email>` line for yourself and any
other Collaborators who have reviewed the change.
- Useful for @mentions / contact list if something goes wrong in the PR.
- Protects against the assumption that GitHub will be around forever.

Review the commit message to ensure that it adheres to the guidelines outlined
in the [contributing](./CONTRIBUTING.md#commit-message-guidelines) guide.

Add all necessary [metadata](#metadata) to commit messages before landing.

See the commit log for examples such as
[this one](https://github.com/nodejs/node/commit/b636ba8186) if unsure
exactly how to format your commit messages.

Additionally:
- Double check PRs to make sure the person's _full name_ and email
address are correct before merging.
- Except when updating dependencies, all commits should be self
contained (meaning every commit should pass all tests). This makes
it much easier when bisecting to find a breaking change.
- All commits should be self-contained (meaning every commit should pass all
tests). This makes it much easier when bisecting to find a breaking change.

### Technical HOWTO

Clear any `am`/`rebase` that may already be underway.
Clear any `am`/`rebase` that may already be underway:

```text
$ git am --abort
$ git rebase --abort
```

Checkout proper target branch
Checkout proper target branch:

```text
$ git checkout master
```

Update the tree (assumes your repo is set up as detailed in
[CONTRIBUTING.md](CONTRIBUTING.md#step-1-fork))
[CONTRIBUTING.md](CONTRIBUTING.md#step-1-fork)):

```text
$ git fetch upstream
$ git merge --ff-only upstream/master
```

Apply external patches
Apply external patches:

```text
$ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fix
Expand All @@ -442,21 +427,19 @@ against the original PR carefully and build/test on at least one platform
before landing. If the 3-way merge fails, then it is most likely that a conflicting
PR has landed since the CI run and you will have to ask the author to rebase.

Check and re-review the changes
Check and re-review the changes:

```text
$ git diff upstream/master
```

Check number of commits and commit messages
Check number of commits and commit messages:

```text
$ git log upstream/master...master
```

If there are multiple commits that relate to the same feature or
one with a feature and separate with a test for that feature,
you'll need to use `squash` or `fixup`:
Squash commits and add metadata:

```text
$ git rebase -i upstream/master
Expand Down Expand Up @@ -512,9 +495,28 @@ Save the file and close the editor. You'll be asked to enter a new
commit message for that commit. This is a good moment to fix incorrect
commit logs, ensure that they are properly formatted, and add
`Reviewed-By` lines.

* The commit message text must conform to the
[commit message guidelines](./CONTRIBUTING.md#commit-message-guidelines).

<a name="metadata"></a>
* Modify the original commit message to include additional metadata regarding
the change process. ([`node-core-utils`][] fetches the metadata for you.)

* Required: A `PR-URL:` line that references the *full* GitHub URL of the
original pull request being merged so it's easy to trace a commit back to
the conversation that led up to that change.
* Optional: A `Fixes: X` line, where _X_ either includes the *full* GitHub URL
for an issue, and/or the hash and commit message if the commit fixes
a bug in a previous commit. Multiple `Fixes:` lines may be added if
appropriate.
* Optional: One or more `Refs:` lines referencing a URL for any relevant
background.
* Required: A `Reviewed-By: Name <email>` line for yourself and any
other Collaborators who have reviewed the change.
* Useful for @mentions / contact list if something goes wrong in the PR.
* Protects against the assumption that GitHub will be around forever.

Run tests (`make -j4 test` or `vcbuild test`). Even though there was a
successful continuous integration run, other changes may have landed on master
since then, so running the tests one last time locally is a good practice.
Expand Down Expand Up @@ -678,3 +680,4 @@ LTS working group and the Release team.
[Stability Index]: doc/api/documentation.md#stability-index
[Enhancement Proposal]: https://github.com/nodejs/node-eps
[git-username]: https://help.github.com/articles/setting-your-username-in-git/
[`node-core-utils`]: https://github.com/nodejs/node-core-utils
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,14 @@ use `Refs:`.
- `Refs: http://eslint.org/docs/rules/space-in-parens.html`
- `Refs: https://github.com/nodejs/node/pull/3615`

5. If your commit introduces a breaking change (`semver-major`), it should
contain an explanation about the reason of the breaking change, which
situation would trigger the breaking change and what is the exact change.

Breaking changes will be listed in the wiki with the aim to make upgrading
easier. Please have a look at [Breaking Changes](https://github.com/nodejs/node/wiki/Breaking-changes-between-v4-LTS-and-v6-LTS)
for the level of detail that's suitable.

Sample complete commit message:

```txt
Expand Down Expand Up @@ -625,6 +633,7 @@ Focus first on the most significant aspects of the change:
1. Does this change make sense for Node.js?
2. Does this change make Node.js better, even if only incrementally?
3. Are there clear bugs or larger scale issues that need attending to?
4. Is the commit message readable and correct? If it contains a breaking change is it clear enough?

When changes are necessary, *request* them, do not *demand* them, and do not
assume that the submitter already knows how to add a test or run a benchmark.
Expand Down
15 changes: 15 additions & 0 deletions CPP_STYLE_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,21 @@ class FancyContainer {
What it says in the title.
## Do not include `*.h` if `*-inl.h` has already been included
Do
```cpp
#include "util-inl.h" // already includes util.h
```

instead of

```cpp
#include "util.h"
#include "util-inl.h"
```

## Avoid throwing JavaScript errors in nested C++ methods

If you need to throw JavaScript errors from a C++ binding method, try to do it
Expand Down
23 changes: 23 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -1146,3 +1146,26 @@ The externally maintained libraries used by Node.js are:
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
"""

- node-inspect, located at deps/node-inspect, is licensed as follows:
"""
Copyright Node.js contributors. All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
"""
48 changes: 40 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -974,17 +974,41 @@ bench-ci: bench
lint-md-clean:
$(RM) -r tools/remark-cli/node_modules
$(RM) -r tools/remark-preset-lint-node/node_modules
$(RM) tools/.*mdlintstamp

lint-md-build:
if [ ! -d tools/remark-cli/node_modules ]; then \
@if [ ! -d tools/remark-cli/node_modules ]; then \
echo "Markdown linter: installing remark-cli into tools/"; \
cd tools/remark-cli && ../../$(NODE) ../../$(NPM) install; fi
if [ ! -d tools/remark-preset-lint-node/node_modules ]; then \
@if [ ! -d tools/remark-preset-lint-node/node_modules ]; then \
echo "Markdown linter: installing remark-preset-lint-node into tools/"; \
cd tools/remark-preset-lint-node && ../../$(NODE) ../../$(NPM) install; fi

lint-md: lint-md-build
@echo "Running Markdown linter..."
$(NODE) tools/remark-cli/cli.js -q -f \
./*.md doc src lib benchmark tools/doc/ tools/icu/
ifneq ("","$(wildcard tools/remark-cli/node_modules/)")
LINT_MD_TARGETS = src lib benchmark tools/doc tools/icu
LINT_MD_ROOT_DOCS := $(wildcard *.md)
LINT_MD_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
-not -path '*node_modules*' -name '*.md') $(LINT_MD_ROOT_DOCS)
LINT_DOC_MD_FILES = $(shell ls doc/**/*.md)

tools/.docmdlintstamp: $(LINT_DOC_MD_FILES)
@echo "Running Markdown linter on docs..."
@$(NODE) tools/remark-cli/cli.js -q -f $(LINT_DOC_MD_FILES)
@touch $@

tools/.miscmdlintstamp: $(LINT_MD_FILES)
@echo "Running Markdown linter on misc docs..."
@$(NODE) tools/remark-cli/cli.js -q -f $(LINT_MD_FILES)
@touch $@

tools/.mdlintstamp: tools/.miscmdlintstamp tools/.docmdlintstamp

lint-md: | tools/.mdlintstamp
else
lint-md:
@echo "The markdown linter is not installed."
@echo "To install (requires internet access) run: $ make lint-md-build"
endif

LINT_JS_TARGETS = benchmark doc lib test tools
LINT_JS_CMD = tools/eslint/bin/eslint.js --cache \
Expand Down Expand Up @@ -1046,10 +1070,13 @@ LINT_CPP_FILES = $(filter-out $(LINT_CPP_EXCLUDE), $(wildcard \
# and the actual filename is generated so it won't match header guards
ADDON_DOC_LINT_FLAGS=-whitespace/ending_newline,-build/header_guard

lint-cpp:
lint-cpp: tools/.cpplintstamp

tools/.cpplintstamp: $(LINT_CPP_FILES)
@echo "Running C++ linter..."
@$(PYTHON) tools/cpplint.py $(LINT_CPP_FILES)
@$(PYTHON) tools/cpplint.py $?
@$(PYTHON) tools/check-imports.py
@touch $@

lint-addon-docs: test/addons/.docbuildstamp
@echo "Running C++ linter on addon docs..."
Expand Down Expand Up @@ -1085,6 +1112,10 @@ lint:
lint-ci: lint
endif

lint-clean:
$(RM) tools/.*lintstamp
$(RM) .eslintcache

.PHONY: $(TARBALL)-headers \
all \
bench \
Expand Down Expand Up @@ -1125,6 +1156,7 @@ endif
install-bin \
install-includes \
lint \
lint-clean \
lint-ci \
lint-cpp \
lint-js \
Expand Down
8 changes: 3 additions & 5 deletions benchmark/_http-benchmarkers.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,9 @@ class TestDoubleBenchmarker {
create(options) {
const child = child_process.fork(this.executable, {
silent: true,
env: {
duration: options.duration,
connections: options.connections,
path: `http://127.0.0.1:${options.port}${options.path}`
}
env: Object.assign({}, process.env, {
test_url: `http://127.0.0.1:${options.port}${options.path}`
})
});
return child;
}
Expand Down
2 changes: 1 addition & 1 deletion benchmark/_test-double-benchmarker.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

const http = require('http');

http.get(process.env.path, function() {
http.get(process.env.test_url, function() {
console.log(JSON.stringify({ throughput: 1 }));
});
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 6
#define V8_MINOR_VERSION 1
#define V8_BUILD_NUMBER 534
#define V8_PATCH_LEVEL 47
#define V8_PATCH_LEVEL 48

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/message/testcfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def IsFailureOutput(self, testcase):
expected_lines, actual_lines, fillvalue=''):
pattern = re.escape(expected.rstrip() % env)
pattern = pattern.replace("\\*", ".*")
pattern = pattern.replace("\\{NUMBER\\}", "\d(?:\.\d*)?")
pattern = pattern.replace("\\{NUMBER\\}", "\d+(?:\.\d*)?")
pattern = "^%s$" % pattern
if not re.match(pattern, actual):
return True
Expand Down
2 changes: 1 addition & 1 deletion doc/api/assert.md
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ assert.fail(1, 2, 'whoops', '>');
// AssertionError [ERR_ASSERTION]: whoops
```

*Note*: Is the last two cases `actual`, `expected`, and `operator` have no
*Note*: In the last two cases `actual`, `expected`, and `operator` have no
influence on the error message.

```js
Expand Down
Loading