Skip to content

Commit 77bdfc9

Browse files
cjihrigMylesBorins
authored andcommitted
deps: upgrade libuv to 1.15.0
PR-URL: #15745 Refs: #15380 Refs: #15683 Fixes: #15394 Fixes: #15770 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 3d2481e commit 77bdfc9

Some content is hidden

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

44 files changed

+532
-159
lines changed

deps/uv/.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Rasmus Christian Pedersen <[email protected]> <[email protected]>
3131
3232
3333
Ryan Emery <[email protected]>
34+
Sakthipriyan Vairamani <[email protected]>
3435
3536
San-Tai Hsu <[email protected]>
3637

deps/uv/AUTHORS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,10 @@ Jacob Segal <[email protected]>
308308
Maciej Szeptuch (Neverous) <[email protected]>
309309
Joel Winarske <[email protected]>
310310
Gergely Nagy <[email protected]>
311+
Kamil Rytarowski <[email protected]>
312+
tux.uudiin <[email protected]>
313+
Nick Logan <[email protected]>
314+
315+
Zheng, Lei <[email protected]>
316+
Carlo Marcelo Arenas Belón <[email protected]>
317+
Scott Parker <[email protected]>

deps/uv/ChangeLog

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
1+
2017.10.03, Version 1.15.0 (Stable), 8b69ce1419d2958011d415a636810705c36c2cc2
2+
3+
Changes since version 1.14.1:
4+
5+
* unix: limit uv__has_forked_with_cfrunloop to macOS (Kamil Rytarowski)
6+
7+
* win: fix buffer size in uv__getpwuid_r() (tux.uudiin)
8+
9+
* win,tty: improve SIGWINCH support (Bartosz Sosnowski)
10+
11+
* unix: use fchmod() in uv_fs_copyfile() (cjihrig)
12+
13+
* unix: support copying empty files (cjihrig)
14+
15+
* unix: truncate destination in uv_fs_copyfile() (Nick Logan)
16+
17+
* win,build: keep cwd when setting build environment (darobs)
18+
19+
* test: add NetBSD support to test-udp-ipv6.c (Kamil Rytarowski)
20+
21+
* unix: add NetBSD support in core.c (Kamil Rytarowski)
22+
23+
* linux: increase thread stack size with musl libc (Ben Noordhuis)
24+
25+
* netbsd: correct uv_exepath() on NetBSD (Kamil Rytarowski)
26+
27+
* test: clean up semaphore after use (jBarz)
28+
29+
* win,build: bump vswhere_usability_wrapper to 2.0.0 (Refael Ackermann)
30+
31+
* win: let UV_PROCESS_WINDOWS_HIDE hide consoles (cjihrig)
32+
33+
* zos: lock protect global epoll list in epoll_ctl (jBarz)
34+
35+
* zos: change platform name to match python (jBarz)
36+
37+
* android: fix getifaddrs() (Zheng, Lei)
38+
39+
* netbsd: implement uv__tty_is_slave() (Kamil Rytarowski)
40+
41+
* zos: fix readlink for mounts with system variables (jBarz)
42+
43+
* test: sort the tests alphabetically (Sakthipriyan Vairamani)
44+
45+
* windows: fix compilation warnings (Carlo Marcelo Arenas Belón)
46+
47+
* build: avoid -fstrict-aliasing compile option (jBarz)
48+
49+
* win: remove unused variables (Carlo Marcelo Arenas Belón)
50+
51+
* unix: remove unused variables (Sakthipriyan Vairamani)
52+
53+
* netbsd: disable poll_bad_fdtype on NetBSD (Kamil Rytarowski)
54+
55+
* netbsd: use uv__cloexec and uv__nonblock (Kamil Rytarowski)
56+
57+
* test: fix udp_multicast_join6 on NetBSD (Kamil Rytarowski)
58+
59+
* unix,win: add uv_mutex_init_recursive() (Scott Parker)
60+
61+
* netbsd: do not exclude IPv6 functionality (Kamil Rytarowski)
62+
63+
* fsevents: watch files with fsevents on macos 10.7+ (Ben Noordhuis)
64+
65+
* unix: retry on ENOBUFS in sendmsg(2) (Kamil Rytarowski)
66+
67+
168
2017.09.07, Version 1.14.1 (Stable), b0f9fb2a07a5e638b1580fe9a42a356c3ab35f37
269

370
Changes since version 1.14.0:

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.14.1.build{build}
1+
version: v1.15.0.build{build}
22

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

deps/uv/common.gypi

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232
},
3333
'xcode_settings': {
3434
'GCC_OPTIMIZATION_LEVEL': '0',
35-
'OTHER_CFLAGS': [ '-Wno-strict-aliasing' ],
3635
},
3736
'conditions': [
38-
['OS != "os390"', {
37+
['OS != "zos"', {
3938
'cflags': [ '-O0', '-fwrapv' ]
4039
}],
4140
['OS == "android"', {
@@ -48,7 +47,6 @@
4847
'defines': [ 'NDEBUG' ],
4948
'cflags': [
5049
'-O3',
51-
'-fstrict-aliasing',
5250
],
5351
'msvs_settings': {
5452
'VCCLCompilerTool': {
@@ -80,7 +78,7 @@
8078
},
8179
},
8280
'conditions': [
83-
['OS != "os390"', {
81+
['OS != "zos"', {
8482
'cflags': [
8583
'-fomit-frame-pointer',
8684
'-fdata-sections',
@@ -160,7 +158,7 @@
160158
'cflags': [ '-pthreads' ],
161159
'ldflags': [ '-pthreads' ],
162160
}],
163-
[ 'OS not in "solaris android os390"', {
161+
[ 'OS not in "solaris android zos"', {
164162
'cflags': [ '-pthread' ],
165163
'ldflags': [ '-pthread' ],
166164
}],
@@ -178,9 +176,6 @@
178176
'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
179177
'PREBINDING': 'NO', # No -Wl,-prebind
180178
'USE_HEADERMAP': 'NO',
181-
'OTHER_CFLAGS': [
182-
'-fstrict-aliasing',
183-
],
184179
'WARNING_CFLAGS': [
185180
'-Wall',
186181
'-Wendif-labels',

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.14.1], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.15.0], [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/threading.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ Functions return 0 on success or an error code < 0 (unless the
9191
return type is void, of course).
9292
9393
.. c:function:: int uv_mutex_init(uv_mutex_t* handle)
94+
.. c:function:: int uv_mutex_init_recursive(uv_mutex_t* handle)
9495
.. c:function:: void uv_mutex_destroy(uv_mutex_t* handle)
9596
.. c:function:: void uv_mutex_lock(uv_mutex_t* handle)
9697
.. c:function:: int uv_mutex_trylock(uv_mutex_t* handle)

deps/uv/include/uv-version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
*/
3232

3333
#define UV_VERSION_MAJOR 1
34-
#define UV_VERSION_MINOR 14
35-
#define UV_VERSION_PATCH 1
34+
#define UV_VERSION_MINOR 15
35+
#define UV_VERSION_PATCH 0
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

deps/uv/include/uv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,7 @@ UV_EXTERN int uv_dlsym(uv_lib_t* lib, const char* name, void** ptr);
14241424
UV_EXTERN const char* uv_dlerror(const uv_lib_t* lib);
14251425

14261426
UV_EXTERN int uv_mutex_init(uv_mutex_t* handle);
1427+
UV_EXTERN int uv_mutex_init_recursive(uv_mutex_t* handle);
14271428
UV_EXTERN void uv_mutex_destroy(uv_mutex_t* handle);
14281429
UV_EXTERN void uv_mutex_lock(uv_mutex_t* handle);
14291430
UV_EXTERN int uv_mutex_trylock(uv_mutex_t* handle);

deps/uv/src/unix/android-ifaddrs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
457457
char *l_name;
458458
char *l_addr;
459459

460-
for(l_rta = IFLA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
460+
for(l_rta = IFA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
461461
{
462462
size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
463463
if(l_info->ifa_family == AF_PACKET)
@@ -479,7 +479,7 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
479479
l_addrSize += NLMSG_ALIGN(calcAddrLen(l_info->ifa_family, l_rtaDataSize));
480480
break;
481481
case IFA_LABEL:
482-
l_nameSize += NLMSG_ALIGN(l_rtaSize + 1);
482+
l_nameSize += NLMSG_ALIGN(l_rtaDataSize + 1);
483483
break;
484484
default:
485485
break;
@@ -504,7 +504,7 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
504504
}
505505

506506
l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifaddrmsg));
507-
for(l_rta = IFLA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
507+
for(l_rta = IFA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
508508
{
509509
void *l_rtaData = RTA_DATA(l_rta);
510510
size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
@@ -567,7 +567,7 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
567567
{
568568
unsigned l_maxPrefix = (l_entry->ifa_addr->sa_family == AF_INET ? 32 : 128);
569569
unsigned l_prefix = (l_info->ifa_prefixlen > l_maxPrefix ? l_maxPrefix : l_info->ifa_prefixlen);
570-
char l_mask[16] = {0};
570+
unsigned char l_mask[16] = {0};
571571
unsigned i;
572572
for(i=0; i<(l_prefix/8); ++i)
573573
{

0 commit comments

Comments
 (0)