Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2307653

Browse filesBrowse files
cjihrigMylesBorins
cjihrig
authored and
MylesBorins
committed
deps: upgrade to libuv 1.20.2
Backport-PR-URL: #24103 PR-URL: #20129 Fixes: #20112 Fixes: #19903 Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
1 parent a1b94d3 commit 2307653
Copy full SHA for 2307653

File tree

Expand file treeCollapse file tree

16 files changed

+268
-129
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

16 files changed

+268
-129
lines changed
Open diff view settings
Collapse file

‎deps/uv/AUTHORS‎

Copy file name to clipboardExpand all lines: deps/uv/AUTHORS
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,3 +332,8 @@ Ryuichi KAWAMATA <ryuichi.kawamata@dena.jp>
332332
Joyee Cheung <joyeec9h3@gmail.com>
333333
Michael Kilburn <crusader.mike@gmail.com>
334334
Ruslan Bekenev <furyinbox@gmail.com>
335+
Bob Burger <rgburger@beckman.com>
336+
Thomas Versteeg <thomasversteeg@gmx.com>
337+
zzzjim <zzzjim@users.noreply.github.com>
338+
Alex Arslan <ararslan@comcast.net>
339+
Kyle Farnung <kfarnung@microsoft.com>
Collapse file

‎deps/uv/ChangeLog‎

Copy file name to clipboardExpand all lines: deps/uv/ChangeLog
+36Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
2018.04.23, Version 1.20.2 (Stable), c51fd3f66bbb386a1efdeba6812789f35a372d1e
2+
3+
Changes since version 1.20.1:
4+
5+
* zos: use custom semaphore (jBarz)
6+
7+
* win: fix registry API error handling (Kyle Farnung)
8+
9+
* build: add support for 64-bit AIX (Richard Lau)
10+
11+
* aix: guard STATIC_ASSERT for glibc work around (Richard Lau)
12+
13+
14+
2018.04.19, Version 1.20.1 (Stable), 36ac2fc8edfd5ff3e9be529be1d4a3f0d5364e94
15+
16+
Changes since version 1.20.0:
17+
18+
* doc,fs: improve documentation (Bob Burger)
19+
20+
* win: return a floored double from uv_uptime() (Refael Ackermann)
21+
22+
* doc: clarify platform specific pipe naming (Thomas Versteeg)
23+
24+
* unix: fix uv_pipe_chmod() on macOS (zzzjim)
25+
26+
* unix: work around glibc semaphore race condition (Anna Henningsen)
27+
28+
* tcp,openbsd: disable Unix TCP check for IPV6_ONLY (Alex Arslan)
29+
30+
* test,openbsd: use RETURN_SKIP in UDP IPv6 tests (Alex Arslan)
31+
32+
* test,openbsd: fix multicast test (Alex Arslan)
33+
34+
* Revert "win, fs: use FILE_WRITE_ATTRIBUTES when opening files" (cjihrig)
35+
36+
137
2018.04.03, Version 1.20.0 (Stable), 0012178ee2b04d9e4a2c66c27cf8891ad8325ceb
238

339
Changes since version 1.19.2:
Collapse file

‎deps/uv/common.gypi‎

Copy file name to clipboardExpand all lines: deps/uv/common.gypi
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
}]
135135
]
136136
}],
137-
['OS in "freebsd dragonflybsd linux openbsd solaris android"', {
137+
['OS in "freebsd dragonflybsd linux openbsd solaris android aix"', {
138138
'cflags': [ '-Wall' ],
139139
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
140140
'target_conditions': [
@@ -162,6 +162,10 @@
162162
'cflags': [ '-pthread' ],
163163
'ldflags': [ '-pthread' ],
164164
}],
165+
[ 'OS=="aix" and target_arch=="ppc64"', {
166+
'cflags': [ '-maix64' ],
167+
'ldflags': [ '-maix64' ],
168+
}],
165169
],
166170
}],
167171
['OS=="mac"', {
Collapse file

‎deps/uv/configure.ac‎

Copy file name to clipboardExpand all lines: deps/uv/configure.ac
+1-1Lines 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.20.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.20.2], [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])
Collapse file

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

Copy file name to clipboardExpand all lines: deps/uv/docs/src/fs.rst
+4-2Lines changed: 4 additions & 2 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ Public members
148148

149149
.. c:member:: void* uv_fs_t.ptr
150150
151-
Stores the result of :c:func:`uv_fs_readlink` and serves as an alias to
152-
`statbuf`.
151+
Stores the result of :c:func:`uv_fs_readlink` and
152+
:c:func:`uv_fs_realpath` and serves as an alias to `statbuf`.
153153

154154
.. seealso:: The :c:type:`uv_req_t` members also apply.
155155

@@ -311,10 +311,12 @@ API
311311
.. c:function:: int uv_fs_readlink(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb)
312312
313313
Equivalent to :man:`readlink(2)`.
314+
The resulting string is stored in `req->ptr`.
314315
315316
.. c:function:: int uv_fs_realpath(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb)
316317
317318
Equivalent to :man:`realpath(3)` on Unix. Windows uses `GetFinalPathNameByHandle <https://msdn.microsoft.com/en-us/library/windows/desktop/aa364962(v=vs.85).aspx>`_.
319+
The resulting string is stored in `req->ptr`.
318320
319321
.. warning::
320322
This function has certain platform-specific caveats that were discovered when used in Node.
Collapse file

‎deps/uv/include/uv-os390.h‎

Copy file name to clipboardExpand all lines: deps/uv/include/uv-os390.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#ifndef UV_MVS_H
2323
#define UV_MVS_H
2424

25-
#define UV_PLATFORM_SEM_T int
25+
#define UV_PLATFORM_SEM_T long
2626

2727
#define UV_PLATFORM_LOOP_FIELDS \
2828
void* ep; \
Collapse file

‎deps/uv/include/uv-version.h‎

Copy file name to clipboardExpand all lines: deps/uv/include/uv-version.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define UV_VERSION_MAJOR 1
3434
#define UV_VERSION_MINOR 20
35-
#define UV_VERSION_PATCH 0
35+
#define UV_VERSION_PATCH 2
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

Collapse file

‎deps/uv/src/unix/pipe.c‎

Copy file name to clipboardExpand all lines: deps/uv/src/unix/pipe.c
+20-15Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -319,21 +319,6 @@ int uv_pipe_chmod(uv_pipe_t* handle, int mode) {
319319
mode != (UV_WRITABLE | UV_READABLE))
320320
return UV_EINVAL;
321321

322-
if (fstat(uv__stream_fd(handle), &pipe_stat) == -1)
323-
return UV__ERR(errno);
324-
325-
desired_mode = 0;
326-
if (mode & UV_READABLE)
327-
desired_mode |= S_IRUSR | S_IRGRP | S_IROTH;
328-
if (mode & UV_WRITABLE)
329-
desired_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
330-
331-
/* Exit early if pipe already has desired mode. */
332-
if ((pipe_stat.st_mode & desired_mode) == desired_mode)
333-
return 0;
334-
335-
pipe_stat.st_mode |= desired_mode;
336-
337322
/* Unfortunately fchmod does not work on all platforms, we will use chmod. */
338323
name_len = 0;
339324
r = uv_pipe_getsockname(handle, NULL, &name_len);
@@ -350,6 +335,26 @@ int uv_pipe_chmod(uv_pipe_t* handle, int mode) {
350335
return r;
351336
}
352337

338+
/* stat must be used as fstat has a bug on Darwin */
339+
if (stat(name_buffer, &pipe_stat) == -1) {
340+
uv__free(name_buffer);
341+
return -errno;
342+
}
343+
344+
desired_mode = 0;
345+
if (mode & UV_READABLE)
346+
desired_mode |= S_IRUSR | S_IRGRP | S_IROTH;
347+
if (mode & UV_WRITABLE)
348+
desired_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
349+
350+
/* Exit early if pipe already has desired mode. */
351+
if ((pipe_stat.st_mode & desired_mode) == desired_mode) {
352+
uv__free(name_buffer);
353+
return 0;
354+
}
355+
356+
pipe_stat.st_mode |= desired_mode;
357+
353358
r = chmod(name_buffer, pipe_stat.st_mode);
354359
uv__free(name_buffer);
355360

Collapse file

‎deps/uv/src/unix/tcp.c‎

Copy file name to clipboardExpand all lines: deps/uv/src/unix/tcp.c
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ int uv__tcp_bind(uv_tcp_t* tcp,
164164
if (setsockopt(tcp->io_watcher.fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)))
165165
return UV__ERR(errno);
166166

167+
#ifndef __OpenBSD__
167168
#ifdef IPV6_V6ONLY
168169
if (addr->sa_family == AF_INET6) {
169170
on = (flags & UV_TCP_IPV6ONLY) != 0;
@@ -179,6 +180,7 @@ int uv__tcp_bind(uv_tcp_t* tcp,
179180
return UV__ERR(errno);
180181
}
181182
}
183+
#endif
182184
#endif
183185

184186
errno = 0;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.