Skip to content

Commit 4875e88

Browse files
cjihrigMylesBorins
authored andcommitted
deps: upgrade to libuv 1.24.1
PR-URL: #25078 Fixes: #24521 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]>
1 parent 1ff2f4b commit 4875e88

Some content is hidden

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

60 files changed

+421
-127
lines changed

deps/uv/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Makefile.in
4242
/android-toolchain
4343

4444
/out/
45-
/build/gyp
45+
/build/
4646

4747
/test/.libs/
4848
/test/run-tests

deps/uv/AUTHORS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,3 +356,9 @@ hitesh <[email protected]>
356356
Svante Signell <[email protected]>
357357
Samuel Thibault <[email protected]>
358358
Jeremy Studer <[email protected]>
359+
damon-kwok <[email protected]>
360+
Damon Kwok <[email protected]>
361+
Ashe Connor <[email protected]>
362+
363+
Ivan Krylov <[email protected]>
364+
Michael Meier <[email protected]>

deps/uv/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set(uv_sources
1515
src/fs-poll.c
1616
src/idna.c
1717
src/inet.c
18+
src/strscpy.c
1819
src/threadpool.c
1920
src/timer.c
2021
src/uv-common.c
@@ -116,6 +117,7 @@ set(uv_test_sources
116117
test/test-socket-buffer-size.c
117118
test/test-spawn.c
118119
test/test-stdio-over-pipes.c
120+
test/test-strscpy.c
119121
test/test-tcp-alloc-cb-fail.c
120122
test/test-tcp-bind-error.c
121123
test/test-tcp-bind6-error.c
@@ -208,7 +210,11 @@ if(WIN32)
208210
list(APPEND uv_test_sources src/win/snprintf.c test/runner-win.c)
209211
else()
210212
list(APPEND uv_defines _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE)
211-
list(APPEND uv_libraries pthread)
213+
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
214+
# Android has pthread as part of its c library, not as a separate
215+
# libpthread.so.
216+
list(APPEND uv_libraries pthread)
217+
endif()
212218
list(APPEND uv_sources
213219
src/unix/async.c
214220
src/unix/core.c

deps/uv/ChangeLog

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
2018.12.17, Version 1.24.1 (Stable), 274f2bd3b70847cadd9a3965577a87e666ab9ac3
2+
3+
Changes since version 1.24.0:
4+
5+
* test: fix platform_output test on cygwin (damon-kwok)
6+
7+
* gitignore: ignore build/ directory (Damon Kwok)
8+
9+
* unix: zero epoll_event before use (Ashe Connor)
10+
11+
* darwin: use runtime check for file cloning (Ben Noordhuis)
12+
13+
* doc: replace deprecated build command on macOS (Rick)
14+
15+
* warnings: fix code that emits compiler warnings (Jameson Nash)
16+
17+
* doc: clarify expected memory management strategy (Ivan Krylov)
18+
19+
* test: add uv_inet_ntop(AF_INET) coverage (Ben Noordhuis)
20+
21+
* unix: harden string copying, introduce strscpy() (Ben Noordhuis)
22+
23+
* linux: get rid of strncpy() call (Ben Noordhuis)
24+
25+
* aix: get rid of strcat() calls (Ben Noordhuis)
26+
27+
* aix: fix data race in uv_fs_event_start() (Ben Noordhuis)
28+
29+
* win: fs: fix `FILE_FLAG_NO_BUFFERING` for writes (Joran Dirk Greef)
30+
31+
* build: don't link against -lpthread on Android (Michael Meier)
32+
33+
134
2018.11.14, Version 1.24.0 (Stable), 2d427ee0083d1baf995df4ebf79a3f8890e9a3e1
235

336
Changes since version 1.23.2:

deps/uv/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ libuv_la_SOURCES = src/fs-poll.c \
3232
src/idna.c \
3333
src/inet.c \
3434
src/queue.h \
35+
src/strscpy.c \
36+
src/strscpy.h \
3537
src/threadpool.c \
3638
src/timer.c \
3739
src/uv-data-getter-setters.c \
@@ -241,6 +243,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
241243
test/test-socket-buffer-size.c \
242244
test/test-spawn.c \
243245
test/test-stdio-over-pipes.c \
246+
test/test-strscpy.c \
244247
test/test-tcp-alloc-cb-fail.c \
245248
test/test-tcp-bind-error.c \
246249
test/test-tcp-bind6-error.c \

deps/uv/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@ Run:
262262

263263
```bash
264264
$ ./gyp_uv.py -f xcode
265-
$ xcodebuild -ARCHS="x86_64" -project uv.xcodeproj \
266-
-configuration Release -target All
265+
$ xcodebuild -ARCHS="x86_64" -project out/uv.xcodeproj -configuration Release -alltargets
267266
```
268267

269268
Using Homebrew:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ API
140140
141141
Request handle to be closed. `close_cb` will be called asynchronously after
142142
this call. This MUST be called on each handle before memory is released.
143+
Moreover, the memory can only be released in `close_cb` or after it has
144+
returned.
143145
144146
Handles that wrap file descriptors are closed immediately but
145147
`close_cb` will still be deferred to the next iteration of the event loop.

deps/uv/include/uv/version.h

Lines 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 24
35-
#define UV_VERSION_PATCH 0
35+
#define UV_VERSION_PATCH 1
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

deps/uv/include/uv/win.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
2727
typedef intptr_t ssize_t;
28+
# define SSIZE_MAX INTPTR_MAX
2829
# define _SSIZE_T_
2930
# define _SSIZE_T_DEFINED
3031
#endif

0 commit comments

Comments
 (0)