From b2a0d8f65e16e2299f8dab47cfe89233fee7931b Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 26 Feb 2015 11:27:18 +0100
Subject: deps: update libuv to 1.4.2

PR-URL: https://github.com/iojs/io.js/pull/966
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 deps/uv/ChangeLog            | 9 ++++++++-
 deps/uv/configure.ac         | 2 +-
 deps/uv/include/uv-version.h | 2 +-
 deps/uv/src/unix/stream.c    | 3 ++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'deps/uv')

diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog
index 79b1ac7169..7bbe5027a7 100644
--- a/deps/uv/ChangeLog
+++ b/deps/uv/ChangeLog
@@ -1,4 +1,11 @@
-2015.02.25, Version 1.4.1 (Stable)
+2015.02.27, Version 1.4.2 (Stable)
+
+Changes since version 1.4.1:
+
+* stream: ignore EINVAL for SO_OOBINLINE on OS X (Fedor Indutny)
+
+
+2015.02.25, Version 1.4.1 (Stable), e8e3fc5789cc0f02937879d141cca0411274093c
 
 Changes since version 1.4.0:
 
diff --git a/deps/uv/configure.ac b/deps/uv/configure.ac
index b52330f0fc..9473d5ffcb 100644
--- a/deps/uv/configure.ac
+++ b/deps/uv/configure.ac
@@ -13,7 +13,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([libuv], [1.4.1], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.4.2], [https://github.com/libuv/libuv/issues])
 AC_CONFIG_MACRO_DIR([m4])
 m4_include([m4/libuv-extra-automake-flags.m4])
 m4_include([m4/as_case.m4])
diff --git a/deps/uv/include/uv-version.h b/deps/uv/include/uv-version.h
index c1a69532a1..836d399d77 100644
--- a/deps/uv/include/uv-version.h
+++ b/deps/uv/include/uv-version.h
@@ -32,7 +32,7 @@
 
 #define UV_VERSION_MAJOR 1
 #define UV_VERSION_MINOR 4
-#define UV_VERSION_PATCH 1
+#define UV_VERSION_PATCH 2
 #define UV_VERSION_IS_RELEASE 1
 #define UV_VERSION_SUFFIX ""
 
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
-- 
cgit v1.2.3