From e445fbda1f76ee87141c7320f31f29a8a9a1729f Mon Sep 17 00:00:00 2001 From: Timothy J Fontaine Date: Wed, 21 Aug 2013 14:44:20 -0700 Subject: [PATCH] uv: Upgrade v0.10.14 --- deps/uv/ChangeLog | 9 ++++++++- deps/uv/src/unix/process.c | 4 +++- deps/uv/src/version.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog index 6ffffc7..9d97bdd 100644 --- a/deps/uv/ChangeLog +++ b/deps/uv/ChangeLog @@ -1,4 +1,11 @@ -2013.07.26, Version 0.10.13 (Stable) +2013.08.22, Version 0.10.14 (Stable) + +Changes since version 0.10.13: + +* unix: retry waitpid() on EINTR (Ben Noordhuis) + + +2013.07.26, Version 0.10.13 (Stable), 381312e1fe6fecbabc943ccd56f0e7d114b3d064 Changes since version 0.10.12: diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c index 267ecb6..7ef84d0 100644 --- a/deps/uv/src/unix/process.c +++ b/deps/uv/src/unix/process.c @@ -73,7 +73,9 @@ static void uv__chld(uv_signal_t* handle, int signum) { assert(signum == SIGCHLD); for (;;) { - pid = waitpid(-1, &status, WNOHANG); + do + pid = waitpid(-1, &status, WNOHANG); + while (pid == -1 && errno == EINTR); if (pid == 0) return; diff --git a/deps/uv/src/version.c b/deps/uv/src/version.c index 1010b2a..e351af6 100644 --- a/deps/uv/src/version.c +++ b/deps/uv/src/version.c @@ -34,7 +34,7 @@ #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 -#define UV_VERSION_PATCH 13 +#define UV_VERSION_PATCH 14 #define UV_VERSION_IS_RELEASE 1 -- 2.7.4