summaryrefslogtreecommitdiff
path: root/deps/uv/src/unix/stream.c
diff options
context:
space:
mode:
authorSaúl Ibarra Corretgé <saghul@gmail.com>2015-12-13 12:07:04 +0100
committerSaúl Ibarra Corretgé <saghul@gmail.com>2015-12-14 21:53:42 +0100
commit69b94ec55cb0f8bd90475b5b7dabd57beb7e7dfe (patch)
treed2afb35396d77e45647e1818357a7e17b2be2244 /deps/uv/src/unix/stream.c
parente0bb118a1d5f8b6b1eb2405f2dc19b8118f8ec0e (diff)
downloadandroid-node-v8-69b94ec55cb0f8bd90475b5b7dabd57beb7e7dfe.tar.gz
android-node-v8-69b94ec55cb0f8bd90475b5b7dabd57beb7e7dfe.tar.bz2
android-node-v8-69b94ec55cb0f8bd90475b5b7dabd57beb7e7dfe.zip
deps: upgrade libuv to 1.8.0
Fixes: https://github.com/nodejs/node/issues/3718 PR-URL: https://github.com/nodejs/node/pull/4276 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/uv/src/unix/stream.c')
-rw-r--r--deps/uv/src/unix/stream.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
index 183b68cf71..7d7ab2633b 100644
--- a/deps/uv/src/unix/stream.c
+++ b/deps/uv/src/unix/stream.c
@@ -779,9 +779,9 @@ start:
if (req->send_handle) {
struct msghdr msg;
- char scratch[64];
struct cmsghdr *cmsg;
int fd_to_send = uv__handle_fd((uv_handle_t*) req->send_handle);
+ char scratch[64] = {0};
assert(fd_to_send >= 0);
@@ -1471,7 +1471,7 @@ int uv_try_write(uv_stream_t* stream,
uv__stream_osx_interrupt_select(stream);
}
- if (written == 0)
+ if (written == 0 && req_size != 0)
return -EAGAIN;
else
return written;