Skip to content

Commit b2a0d8f

Browse files
committed
deps: update libuv to 1.4.2
PR-URL: #966 Reviewed-By: Fedor Indutny <[email protected]>
1 parent e435a01 commit b2a0d8f

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

deps/uv/ChangeLog

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
2015.02.25, Version 1.4.1 (Stable)
1+
2015.02.27, Version 1.4.2 (Stable)
2+
3+
Changes since version 1.4.1:
4+
5+
* stream: ignore EINVAL for SO_OOBINLINE on OS X (Fedor Indutny)
6+
7+
8+
2015.02.25, Version 1.4.1 (Stable), e8e3fc5789cc0f02937879d141cca0411274093c
29

310
Changes since version 1.4.0:
411

deps/uv/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [1.4.1], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.4.2], [https://github.com/libuv/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])

deps/uv/include/uv-version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define UV_VERSION_MAJOR 1
3434
#define UV_VERSION_MINOR 4
35-
#define UV_VERSION_PATCH 1
35+
#define UV_VERSION_PATCH 2
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

deps/uv/src/unix/stream.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ int uv__stream_open(uv_stream_t* stream, int fd, int flags) {
394394
#if defined(__APPLE__)
395395
enable = 1;
396396
if (setsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &enable, sizeof(enable)) &&
397-
errno != ENOTSOCK) {
397+
errno != ENOTSOCK &&
398+
errno != EINVAL) {
398399
return -errno;
399400
}
400401
#endif

0 commit comments

Comments
 (0)