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 f69a823

Browse filesBrowse files
cjihrigtargos
cjihrig
authored and
targos
committed
deps: upgrade to libuv 1.20.3
Refs: #19377 PR-URL: #20585 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent c546746 commit f69a823
Copy full SHA for f69a823

File tree

Expand file treeCollapse file tree

13 files changed

+87
-7
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

13 files changed

+87
-7
lines changed
Open diff view settings
Collapse file

‎deps/uv/AUTHORS‎

Copy file name to clipboardExpand all lines: deps/uv/AUTHORS
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,3 +337,4 @@ Thomas Versteeg <thomasversteeg@gmx.com>
337337
zzzjim <zzzjim@users.noreply.github.com>
338338
Alex Arslan <ararslan@comcast.net>
339339
Kyle Farnung <kfarnung@microsoft.com>
340+
ssrlive <30760636+ssrlive@users.noreply.github.com>
Collapse file

‎deps/uv/ChangeLog‎

Copy file name to clipboardExpand all lines: deps/uv/ChangeLog
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
2018.05.08, Version 1.20.3 (Stable), 8cfd67e59195251dff793ee47c185c9d6a8f3818
2+
3+
Changes since version 1.20.2:
4+
5+
* win: add Windows XP support to uv_if_indextoname() (ssrlive)
6+
7+
* win: fix `'floor' undefined` compiler warning (ssrlive)
8+
9+
* win, pipe: stop read for overlapped pipe (Bartosz Sosnowski)
10+
11+
* build: fix utf-8 name of copyright holder (Jérémy Lal)
12+
13+
* zos: initialize pollfd revents (jBarz)
14+
15+
* zos,doc: add system V message queue note (jBarz)
16+
17+
* linux: don't use uv__nonblock_ioctl() on sparc (Ben Noordhuis)
18+
19+
120
2018.04.23, Version 1.20.2 (Stable), c51fd3f66bbb386a1efdeba6812789f35a372d1e
221

322
Changes since version 1.20.1:
Collapse file

‎deps/uv/README.md‎

Copy file name to clipboardExpand all lines: deps/uv/README.md
+7Lines changed: 7 additions & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,13 @@ describes the package in more detail.
322322

323323
AIX support for filesystem events is not compiled when building with `gyp`.
324324

325+
### z/OS Notes
326+
327+
z/OS creates System V semaphores and message queues. These persist on the system
328+
after the process terminates unless the event loop is closed.
329+
330+
Use the `ipcrm` command to manually clear up System V resources.
331+
325332
## Patches
326333

327334
See the [guidelines for contributing][].
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.2], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.20.3], [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/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 2
35+
#define UV_VERSION_PATCH 3
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

Collapse file

‎deps/uv/m4/libuv-check-flags.m4‎

Copy file name to clipboardExpand all lines: deps/uv/m4/libuv-check-flags.m4
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Macros to check the presence of generic (non-typed) symbols.
2-
dnl Copyright (c) 2006-2008 Diego Pettenà <flameeyes gmail com>
2+
dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes gmail com>
33
dnl Copyright (c) 2006-2008 xine project
44
dnl
55
dnl This program is free software; you can redistribute it and/or modify
@@ -316,4 +316,4 @@ AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [
316316
AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned],
317317
[Define the highest alignment supported])
318318
fi
319-
])
319+
])
Collapse file

‎deps/uv/src/unix/internal.h‎

Copy file name to clipboardExpand all lines: deps/uv/src/unix/internal.h
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,18 @@ struct uv__stream_queued_fds_s {
185185
#define uv__nonblock uv__nonblock_fcntl
186186
#endif
187187

188+
/* On Linux, uv__nonblock_fcntl() and uv__nonblock_ioctl() do not commute
189+
* when O_NDELAY is not equal to O_NONBLOCK. Case in point: linux/sparc32
190+
* and linux/sparc64, where O_NDELAY is O_NONBLOCK + another bit.
191+
*
192+
* Libuv uses uv__nonblock_fcntl() directly sometimes so ensure that it
193+
* commutes with uv__nonblock().
194+
*/
195+
#if defined(__linux__) && O_NDELAY != O_NONBLOCK
196+
#undef uv__nonblock
197+
#define uv__nonblock uv__nonblock_fcntl
198+
#endif
199+
188200
/* core */
189201
int uv__cloexec_ioctl(int fd, int set);
190202
int uv__cloexec_fcntl(int fd, int set);
Collapse file

‎deps/uv/src/unix/os390-syscalls.c‎

Copy file name to clipboardExpand all lines: deps/uv/src/unix/os390-syscalls.c
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ uv__os390_epoll* epoll_create1(int flags) {
215215
maybe_resize(lst, 1);
216216
lst->items[lst->size - 1].fd = lst->msg_queue;
217217
lst->items[lst->size - 1].events = POLLIN;
218+
lst->items[lst->size - 1].revents = 0;
218219
uv_once(&once, epoll_init);
219220
uv_mutex_lock(&global_epoll_lock);
220221
QUEUE_INSERT_TAIL(&global_epoll_queue, &lst->member);
@@ -252,6 +253,7 @@ int epoll_ctl(uv__os390_epoll* lst,
252253
}
253254
lst->items[fd].fd = fd;
254255
lst->items[fd].events = event->events;
256+
lst->items[fd].revents = 0;
255257
} else if (op == EPOLL_CTL_MOD) {
256258
if (fd >= lst->size || lst->items[fd].fd == -1) {
257259
uv_mutex_unlock(&global_epoll_lock);
Collapse file

‎deps/uv/src/win/getaddrinfo.c‎

Copy file name to clipboardExpand all lines: deps/uv/src/win/getaddrinfo.c
+8-2Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,21 @@ int uv_if_indextoname(unsigned int ifindex, char* buffer, size_t* size) {
392392
DWORD bufsize;
393393
int r;
394394

395+
uv__once_init();
396+
395397
if (buffer == NULL || size == NULL || *size == 0)
396398
return UV_EINVAL;
397399

398-
r = ConvertInterfaceIndexToLuid(ifindex, &luid);
400+
if (pConvertInterfaceIndexToLuid == NULL)
401+
return UV_ENOSYS;
402+
r = pConvertInterfaceIndexToLuid(ifindex, &luid);
399403

400404
if (r != 0)
401405
return uv_translate_sys_error(r);
402406

403-
r = ConvertInterfaceLuidToNameW(&luid, wname, ARRAY_SIZE(wname));
407+
if (pConvertInterfaceLuidToNameW == NULL)
408+
return UV_ENOSYS;
409+
r = pConvertInterfaceLuidToNameW(&luid, wname, ARRAY_SIZE(wname));
404410

405411
if (r != 0)
406412
return uv_translate_sys_error(r);
Collapse file

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

Copy file name to clipboardExpand all lines: deps/uv/src/win/pipe.c
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,13 @@ void uv__pipe_unpause_read(uv_pipe_t* handle) {
735735

736736

737737
void uv__pipe_stop_read(uv_pipe_t* handle) {
738+
if (pCancelIoEx &&
739+
!(handle->flags & UV_HANDLE_NON_OVERLAPPED_PIPE) &&
740+
!(handle->flags & UV_HANDLE_EMULATE_IOCP) &&
741+
handle->flags & UV_HANDLE_READING &&
742+
handle->read_req.type == UV_READ) {
743+
pCancelIoEx(handle->handle, &handle->read_req.u.io.overlapped);
744+
}
738745
handle->flags &= ~UV_HANDLE_READING;
739746
uv__pipe_pause_read((uv_pipe_t*)handle);
740747
uv__pipe_unpause_read((uv_pipe_t*)handle);

0 commit comments

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