Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 35059de

Browse files
chakrabotchakrabot
committed
meta: merge node/master into node-chakracore/master
Merge 7b3446e as of 2017-11-11 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Jack Horton <[email protected]>
2 parents 00702bb + 7b3446e commit 35059de

92 files changed

Lines changed: 1873 additions & 499 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BUILDING.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,11 @@ Prerequisites:
197197
* [Visual Studio 2015 Update 3](https://www.visualstudio.com/), all editions
198198
including the Community edition (remember to select
199199
"Common Tools for Visual C++ 2015" feature during installation).
200-
* [Visual Studio 2017](https://www.visualstudio.com/downloads/), any edition (including the Build Tools SKU).
201-
**Required Components:** "MSbuild", "VC++ 2017 v141 toolset" and at least one of the Windows SDKs.
202-
*Note*: For "Windows 10 SDK (10.0.15063.0)" only the "Desktop C++ x86 and x64" flavor is required.
200+
* The "Desktop development with C++" workload from
201+
[Visual Studio 2017](https://www.visualstudio.com/downloads/) or the
202+
"Visual C++ build tools" workload from the
203+
[Build Tools](https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017),
204+
with the default optional components.
203205
* Basic Unix tools required for some tests,
204206
[Git for Windows](http://git-scm.com/download/win) includes Git Bash
205207
and tools which can be included in the global `PATH`.

‎CONTRIBUTING.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,14 @@ use `Refs:`.
334334
- `Refs: http://eslint.org/docs/rules/space-in-parens.html`
335335
- `Refs: https://github.com/nodejs/node/pull/3615`
336336

337+
5. If your commit introduces a breaking change (`semver-major`), it should
338+
contain an explanation about the reason of the breaking change, which
339+
situation would trigger the breaking change and what is the exact change.
340+
341+
Breaking changes will be listed in the wiki with the aim to make upgrading
342+
easier. Please have a look at [Breaking Changes](https://github.com/nodejs/node/wiki/Breaking-changes-between-v4-LTS-and-v6-LTS)
343+
for the level of detail that's suitable.
344+
337345
Sample complete commit message:
338346

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

629638
When changes are necessary, *request* them, do not *demand* them, and do not
630639
assume that the submitter already knows how to add a test or run a benchmark.

‎Makefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ lint-md-build:
984984
echo "Markdown linter: installing remark-preset-lint-node into tools/"; \
985985
cd tools/remark-preset-lint-node && ../../$(NODE) ../../$(NPM) install; fi
986986

987+
ifneq ("","$(wildcard tools/remark-cli/node_modules/)")
987988
LINT_MD_TARGETS = src lib benchmark tools/doc tools/icu
988989
LINT_MD_ROOT_DOCS := $(wildcard *.md)
989990
LINT_MD_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
@@ -1002,7 +1003,12 @@ tools/.miscmdlintstamp: $(LINT_MD_FILES)
10021003

10031004
tools/.mdlintstamp: tools/.miscmdlintstamp tools/.docmdlintstamp
10041005

1005-
lint-md: | lint-md-build tools/.mdlintstamp
1006+
lint-md: | tools/.mdlintstamp
1007+
else
1008+
lint-md:
1009+
@echo "The markdown linter is not installed."
1010+
@echo "To install (requires internet access) run: $ make lint-md-build"
1011+
endif
10061012

10071013
LINT_JS_TARGETS = benchmark doc lib test tools
10081014
LINT_JS_CMD = tools/eslint/bin/eslint.js --cache \

‎deps/uv/.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Marc Schlaich <[email protected]> <[email protected]>
2626
Michael <[email protected]>
2727
Michael Neumann <[email protected]> <[email protected]>
2828
Nicholas Vavilov <[email protected]>
29+
Nick Logan <[email protected]> <[email protected]>
2930
Rasmus Christian Pedersen <[email protected]>
3031
Rasmus Christian Pedersen <[email protected]> <[email protected]>
3132
Robert Mustacchi <[email protected]> <[email protected]>

‎deps/uv/AUTHORS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,3 +315,6 @@ darobs <[email protected]>
315315
Zheng, Lei <[email protected]>
316316
Carlo Marcelo Arenas Belón <[email protected]>
317317
Scott Parker <[email protected]>
318+
Wade Brainerd <[email protected]>
319+
rayrase <[email protected]>
320+
Pekka Nikander <[email protected]>

‎deps/uv/ChangeLog‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
2017.11.11, Version 1.16.1 (Stable), 4056fbe46493ef87237e307e0025e551db875e13
2+
3+
Changes since version 1.16.0:
4+
5+
* unix: move net/if.h include (cjihrig)
6+
7+
* win: fix undeclared NDIS_IF_MAX_STRING_SIZE (Nick Logan)
8+
9+
10+
2017.11.07, Version 1.16.0 (Stable), d68779f0ea742918f653b9c20237460271c39aeb
11+
12+
Changes since version 1.15.0:
13+
14+
* win: change st_blksize from `2048` to `4096` (Joran Dirk Greef)
15+
16+
* unix,win: add fs open flags, map O_DIRECT|O_DSYNC (Joran Dirk Greef)
17+
18+
* win, fs: fix non-symlink reparse points (Wade Brainerd)
19+
20+
* test: fix -Wstrict-prototypes warnings (Ben Noordhuis)
21+
22+
* unix, windows: map ENOTTY errno (Ben Noordhuis)
23+
24+
* unix: fall back to fsync() if F_FULLFSYNC fails (Joran Dirk Greef)
25+
26+
* unix: do not close invalid kqueue fd after fork (jBarz)
27+
28+
* zos: reset epoll data after fork (jBarz)
29+
30+
* zos: skip fork_threadpool_queue_work_simple (jBarz)
31+
32+
* test: keep platform_output as first test (Bartosz Sosnowski)
33+
34+
* win: fix non-English dlopen error message (Bartosz Sosnowski)
35+
36+
* unix,win: add uv_os_getppid() (cjihrig)
37+
38+
* test: fix const qualification compiler warning (Ben Noordhuis)
39+
40+
* doc: mark uv_default_loop() as not thread safe (rayrase)
41+
42+
* win, pipe: null-initialize stream->shutdown_req (Jameson Nash)
43+
44+
* tty, win: get SetWinEventHook pointer at startup (Bartosz Sosnowski)
45+
46+
* test: no extra new line in skipped test output (Bartosz Sosnowski)
47+
48+
* pipe: allow access from other users (Bartosz Sosnowski)
49+
50+
* unix,win: add uv_if_{indextoname,indextoiid} (Pekka Nikander)
51+
52+
153
2017.10.03, Version 1.15.0 (Stable), 8b69ce1419d2958011d415a636810705c36c2cc2
254

355
Changes since version 1.14.1:

‎deps/uv/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
212212
test/test-pipe-server-close.c \
213213
test/test-pipe-close-stdout-read-stdin.c \
214214
test/test-pipe-set-non-blocking.c \
215+
test/test-pipe-set-fchmod.c \
215216
test/test-platform-output.c \
216217
test/test-poll.c \
217218
test/test-poll-close.c \

‎deps/uv/appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: v1.15.0.build{build}
1+
version: v1.16.1.build{build}
22

33
init:
44
- git config --global core.autocrlf true

‎deps/uv/configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [1.15.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.16.1], [https://github.com/libuv/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])

‎deps/uv/docs/src/fs.rst‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,3 +353,154 @@ Helper functions
353353
any attempts to close it or to use it after closing the fd may lead to malfunction.
354354
355355
.. versionadded:: 1.12.0
356+
357+
File open constants
358+
-------------------
359+
360+
.. c:macro:: UV_FS_O_APPEND
361+
362+
The file is opened in append mode. Before each write, the file offset is
363+
positioned at the end of the file.
364+
365+
.. c:macro:: UV_FS_O_CREAT
366+
367+
The file is created if it does not already exist.
368+
369+
.. c:macro:: UV_FS_O_DIRECT
370+
371+
File I/O is done directly to and from user-space buffers, which must be
372+
aligned. Buffer size and address should be a multiple of the physical sector
373+
size of the block device.
374+
375+
.. note::
376+
`UV_FS_O_DIRECT` is supported on Linux, and on Windows via
377+
`FILE_FLAG_NO_BUFFERING <https://msdn.microsoft.com/en-us/library/windows/desktop/cc644950.aspx>`_.
378+
`UV_FS_O_DIRECT` is not supported on macOS.
379+
380+
.. c:macro:: UV_FS_O_DIRECTORY
381+
382+
If the path is not a directory, fail the open.
383+
384+
.. note::
385+
`UV_FS_O_DIRECTORY` is not supported on Windows.
386+
387+
.. c:macro:: UV_FS_O_DSYNC
388+
389+
The file is opened for synchronous I/O. Write operations will complete once
390+
all data and a minimum of metadata are flushed to disk.
391+
392+
.. note::
393+
`UV_FS_O_DSYNC` is supported on Windows via
394+
`FILE_FLAG_WRITE_THROUGH <https://msdn.microsoft.com/en-us/library/windows/desktop/cc644950.aspx>`_.
395+
396+
.. c:macro:: UV_FS_O_EXCL
397+
398+
If the `O_CREAT` flag is set and the file already exists, fail the open.
399+
400+
.. note::
401+
In general, the behavior of `O_EXCL` is undefined if it is used without
402+
`O_CREAT`. There is one exception: on Linux 2.6 and later, `O_EXCL` can
403+
be used without `O_CREAT` if pathname refers to a block device. If the
404+
block device is in use by the system (e.g., mounted), the open will fail
405+
with the error `EBUSY`.
406+
407+
.. c:macro:: UV_FS_O_EXLOCK
408+
409+
Atomically obtain an exclusive lock.
410+
411+
.. note::
412+
`UV_FS_O_EXLOCK` is only supported on macOS.
413+
414+
.. c:macro:: UV_FS_O_NOATIME
415+
416+
Do not update the file access time when the file is read.
417+
418+
.. note::
419+
`UV_FS_O_NOATIME` is not supported on Windows.
420+
421+
.. c:macro:: UV_FS_O_NOCTTY
422+
423+
If the path identifies a terminal device, opening the path will not cause
424+
that terminal to become the controlling terminal for the process (if the
425+
process does not already have one).
426+
427+
.. note::
428+
`UV_FS_O_NOCTTY` is not supported on Windows.
429+
430+
.. c:macro:: UV_FS_O_NOFOLLOW
431+
432+
If the path is a symbolic link, fail the open.
433+
434+
.. note::
435+
`UV_FS_O_NOFOLLOW` is not supported on Windows.
436+
437+
.. c:macro:: UV_FS_O_NONBLOCK
438+
439+
Open the file in nonblocking mode if possible.
440+
441+
.. note::
442+
`UV_FS_O_NONBLOCK` is not supported on Windows.
443+
444+
.. c:macro:: UV_FS_O_RANDOM
445+
446+
Access is intended to be random. The system can use this as a hint to
447+
optimize file caching.
448+
449+
.. note::
450+
`UV_FS_O_RANDOM` is only supported on Windows via
451+
`FILE_FLAG_RANDOM_ACCESS <https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858.aspx>`_.
452+
453+
.. c:macro:: UV_FS_O_RDONLY
454+
455+
Open the file for read-only access.
456+
457+
.. c:macro:: UV_FS_O_RDWR
458+
459+
Open the file for read-write access.
460+
461+
.. c:macro:: UV_FS_O_SEQUENTIAL
462+
463+
Access is intended to be sequential from beginning to end. The system can
464+
use this as a hint to optimize file caching.
465+
466+
.. note::
467+
`UV_FS_O_SEQUENTIAL` is only supported on Windows via
468+
`FILE_FLAG_SEQUENTIAL_SCAN <https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858.aspx>`_.
469+
470+
.. c:macro:: UV_FS_O_SHORT_LIVED
471+
472+
The file is temporary and should not be flushed to disk if possible.
473+
474+
.. note::
475+
`UV_FS_O_SHORT_LIVED` is only supported on Windows via
476+
`FILE_ATTRIBUTE_TEMPORARY <https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858.aspx>`_.
477+
478+
.. c:macro:: UV_FS_O_SYMLINK
479+
480+
Open the symbolic link itself rather than the resource it points to.
481+
482+
.. c:macro:: UV_FS_O_SYNC
483+
484+
The file is opened for synchronous I/O. Write operations will complete once
485+
all data and all metadata are flushed to disk.
486+
487+
.. note::
488+
`UV_FS_O_SYNC` is supported on Windows via
489+
`FILE_FLAG_WRITE_THROUGH <https://msdn.microsoft.com/en-us/library/windows/desktop/cc644950.aspx>`_.
490+
491+
.. c:macro:: UV_FS_O_TEMPORARY
492+
493+
The file is temporary and should not be flushed to disk if possible.
494+
495+
.. note::
496+
`UV_FS_O_TEMPORARY` is only supported on Windows via
497+
`FILE_ATTRIBUTE_TEMPORARY <https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858.aspx>`_.
498+
499+
.. c:macro:: UV_FS_O_TRUNC
500+
501+
If the file exists and is a regular file, and the file is opened
502+
successfully for write access, its length shall be truncated to zero.
503+
504+
.. c:macro:: UV_FS_O_WRONLY
505+
506+
Open the file for write-only access.

0 commit comments

Comments
 (0)