diff options
| author | cjihrig <cjihrig@gmail.com> | 2016-10-24 22:13:07 -0400 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2016-10-26 09:42:41 -0400 |
| commit | 63243bcb330408d511b3945c53719425d8b7abb8 (patch) | |
| tree | f24252040adcc8c1a1dda22965fec39ac8df72de /deps/uv/src/unix/poll.c | |
| parent | 2d472a36c1d5e565fe375185f273402f84bed528 (diff) | |
| download | android-node-v8-63243bcb330408d511b3945c53719425d8b7abb8.tar.gz android-node-v8-63243bcb330408d511b3945c53719425d8b7abb8.tar.bz2 android-node-v8-63243bcb330408d511b3945c53719425d8b7abb8.zip | |
deps: upgrade libuv to 1.10.0
Fixes: https://github.com/nodejs/node/issues/4351
Fixes: https://github.com/nodejs/node/issues/6763
Refs: https://github.com/nodejs/node/pull/8280
PR-URL: https://github.com/nodejs/node/pull/9267
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps/uv/src/unix/poll.c')
| -rw-r--r-- | deps/uv/src/unix/poll.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/deps/uv/src/unix/poll.c b/deps/uv/src/unix/poll.c index 0d5944b0af..4c0d478eee 100644 --- a/deps/uv/src/unix/poll.c +++ b/deps/uv/src/unix/poll.c @@ -59,7 +59,14 @@ int uv_poll_init(uv_loop_t* loop, uv_poll_t* handle, int fd) { if (err) return err; + /* If ioctl(FIONBIO) reports ENOTTY, try fcntl(F_GETFL) + fcntl(F_SETFL). + * Workaround for e.g. kqueue fds not supporting ioctls. + */ err = uv__nonblock(fd, 1); + if (err == -ENOTTY) + if (uv__nonblock == uv__nonblock_ioctl) + err = uv__nonblock_fcntl(fd, 1); + if (err) return err; |