mirror of
https://github.com/nodejs/node.git
synced 2024-12-01 16:10:02 +01:00
deps: update libuv to 1.4.2
PR-URL: https://github.com/iojs/io.js/pull/966 Reviewed-By: Fedor Indutny <fedor@indutny.com>
This commit is contained in:
parent
e435a0114d
commit
b2a0d8f65e
9
deps/uv/ChangeLog
vendored
9
deps/uv/ChangeLog
vendored
@ -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:
|
||||
|
||||
|
2
deps/uv/configure.ac
vendored
2
deps/uv/configure.ac
vendored
@ -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])
|
||||
|
2
deps/uv/include/uv-version.h
vendored
2
deps/uv/include/uv-version.h
vendored
@ -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 ""
|
||||
|
||||
|
3
deps/uv/src/unix/stream.c
vendored
3
deps/uv/src/unix/stream.c
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user