summaryrefslogtreecommitdiff
path: root/deps/uv/src/fs-poll.c
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2019-05-15 13:24:08 -0400
committercjihrig <cjihrig@gmail.com>2019-05-21 10:37:14 -0400
commit46d8af5e618554fcac89e4b15bf06f81de36ef54 (patch)
tree2c4e88611012eadb6ad054513357d0b957272592 /deps/uv/src/fs-poll.c
parent0ca9297c3945f52325fcd08afe3fb9dfe3adf123 (diff)
downloadandroid-node-v8-46d8af5e618554fcac89e4b15bf06f81de36ef54.tar.gz
android-node-v8-46d8af5e618554fcac89e4b15bf06f81de36ef54.tar.bz2
android-node-v8-46d8af5e618554fcac89e4b15bf06f81de36ef54.zip
deps: upgrade to libuv 1.29.1
Notable changes: - uv_get_constrained_memory() has been added. - A race condition in uv_async_send() has been fixed. - uv_get_free_memory() and uv_get_total_memory() now read from /proc/meminfo, which should improve correctness when called from inside an lxc container. - A failed assertion in uv_fs_poll_stop() has been fixed. - A bug in MAC addresses for IP-aliases has been fixed. Fixes: https://github.com/nodejs/node/issues/27170 Fixes: https://github.com/nodejs/node/issues/27493 PR-URL: https://github.com/nodejs/node/pull/27718 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps/uv/src/fs-poll.c')
-rw-r--r--deps/uv/src/fs-poll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/uv/src/fs-poll.c b/deps/uv/src/fs-poll.c
index 40cb147e8d..89864e23fb 100644
--- a/deps/uv/src/fs-poll.c
+++ b/deps/uv/src/fs-poll.c
@@ -241,7 +241,7 @@ static void timer_close_cb(uv_handle_t* timer) {
handle = ctx->parent_handle;
if (ctx == handle->poll_ctx) {
handle->poll_ctx = ctx->previous;
- if (handle->poll_ctx == NULL)
+ if (handle->poll_ctx == NULL && uv__is_closing(handle))
uv__make_close_pending((uv_handle_t*)handle);
} else {
for (last = handle->poll_ctx, it = last->previous;