diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-26 11:27:18 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-26 14:24:58 +0100 |
| commit | b2a0d8f65e16e2299f8dab47cfe89233fee7931b (patch) | |
| tree | 7ecb8a4e4ee753596def52b4a35e5f8525c60413 /deps/uv/src/unix/stream.c | |
| parent | e435a0114d973231f44b10edbff583210e975510 (diff) | |
| download | android-node-v8-b2a0d8f65e16e2299f8dab47cfe89233fee7931b.tar.gz android-node-v8-b2a0d8f65e16e2299f8dab47cfe89233fee7931b.tar.bz2 android-node-v8-b2a0d8f65e16e2299f8dab47cfe89233fee7931b.zip | |
deps: update libuv to 1.4.2
PR-URL: https://github.com/iojs/io.js/pull/966
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps/uv/src/unix/stream.c')
| -rw-r--r-- | deps/uv/src/unix/stream.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c index 8d00838fb9..518a2fce0f 100644 --- a/deps/uv/src/unix/stream.c +++ b/deps/uv/src/unix/stream.c @@ -394,7 +394,8 @@ int uv__stream_open(uv_stream_t* stream, int fd, int flags) { #if defined(__APPLE__) enable = 1; if (setsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &enable, sizeof(enable)) && - errno != ENOTSOCK) { + errno != ENOTSOCK && + errno != EINVAL) { return -errno; } #endif |