Upgrade libuv to 9c7ed0d
Fixes test-net-pipe-connect-errors.js on UNIX. See #2001.
This commit is contained in:
parent
b904a078d8
commit
cf78d04ae2
1
deps/uv/common.gypi
vendored
1
deps/uv/common.gypi
vendored
@ -152,7 +152,6 @@
|
|||||||
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
|
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
|
||||||
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
|
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
|
||||||
'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
|
'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
|
||||||
'GCC_VERSION': '4.2',
|
|
||||||
'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof
|
'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof
|
||||||
'MACOSX_DEPLOYMENT_TARGET': '10.4', # -mmacosx-version-min=10.4
|
'MACOSX_DEPLOYMENT_TARGET': '10.4', # -mmacosx-version-min=10.4
|
||||||
'PREBINDING': 'NO', # No -Wl,-prebind
|
'PREBINDING': 'NO', # No -Wl,-prebind
|
||||||
|
2
deps/uv/include/uv.h
vendored
2
deps/uv/include/uv.h
vendored
@ -72,7 +72,7 @@ typedef enum {
|
|||||||
UV_OK = 0,
|
UV_OK = 0,
|
||||||
UV_EOF,
|
UV_EOF,
|
||||||
UV_EADDRINFO,
|
UV_EADDRINFO,
|
||||||
UV_EACCESS,
|
UV_EACCES,
|
||||||
UV_EAGAIN,
|
UV_EAGAIN,
|
||||||
UV_EADDRINUSE,
|
UV_EADDRINUSE,
|
||||||
UV_EADDRNOTAVAIL,
|
UV_EADDRNOTAVAIL,
|
||||||
|
6
deps/uv/src/unix/error.c
vendored
6
deps/uv/src/unix/error.c
vendored
@ -59,8 +59,9 @@ void uv_fatal_error(const int errorno, const char* syscall) {
|
|||||||
static int uv__translate_lib_error(int code) {
|
static int uv__translate_lib_error(int code) {
|
||||||
switch (code) {
|
switch (code) {
|
||||||
case UV_ENOSYS: return ENOSYS;
|
case UV_ENOSYS: return ENOSYS;
|
||||||
|
case UV_ENOTSOCK: return ENOTSOCK;
|
||||||
case UV_ENOENT: return ENOENT;
|
case UV_ENOENT: return ENOENT;
|
||||||
case UV_EACCESS: return EACCES;
|
case UV_EACCES: return EACCES;
|
||||||
case UV_EAFNOSUPPORT: return EAFNOSUPPORT;
|
case UV_EAFNOSUPPORT: return EAFNOSUPPORT;
|
||||||
case UV_EBADF: return EBADF;
|
case UV_EBADF: return EBADF;
|
||||||
case UV_EPIPE: return EPIPE;
|
case UV_EPIPE: return EPIPE;
|
||||||
@ -89,8 +90,9 @@ uv_err_code uv_translate_sys_error(int sys_errno) {
|
|||||||
switch (sys_errno) {
|
switch (sys_errno) {
|
||||||
case 0: return UV_OK;
|
case 0: return UV_OK;
|
||||||
case ENOSYS: return UV_ENOSYS;
|
case ENOSYS: return UV_ENOSYS;
|
||||||
|
case ENOTSOCK: return UV_ENOTSOCK;
|
||||||
case ENOENT: return UV_ENOENT;
|
case ENOENT: return UV_ENOENT;
|
||||||
case EACCES: return UV_EACCESS;
|
case EACCES: return UV_EACCES;
|
||||||
case EAFNOSUPPORT: return UV_EAFNOSUPPORT;
|
case EAFNOSUPPORT: return UV_EAFNOSUPPORT;
|
||||||
case EBADF: return UV_EBADF;
|
case EBADF: return UV_EBADF;
|
||||||
case EPIPE: return UV_EPIPE;
|
case EPIPE: return UV_EPIPE;
|
||||||
|
2
deps/uv/src/unix/pipe.c
vendored
2
deps/uv/src/unix/pipe.c
vendored
@ -209,7 +209,7 @@ int uv_pipe_connect(uv_connect_t* req,
|
|||||||
while (r == -1 && errno == EINTR);
|
while (r == -1 && errno == EINTR);
|
||||||
|
|
||||||
if (r == -1) {
|
if (r == -1) {
|
||||||
uv__set_sys_error(handle->loop, errno);
|
status = errno;
|
||||||
uv__close(sockfd);
|
uv__close(sockfd);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
2
deps/uv/src/uv-common.c
vendored
2
deps/uv/src/uv-common.c
vendored
@ -57,7 +57,7 @@ const char* uv_err_name(uv_err_t err) {
|
|||||||
case UV_OK: return "OK";
|
case UV_OK: return "OK";
|
||||||
case UV_EOF: return "EOF";
|
case UV_EOF: return "EOF";
|
||||||
case UV_EADDRINFO: return "EADDRINFO";
|
case UV_EADDRINFO: return "EADDRINFO";
|
||||||
case UV_EACCESS: return "EACCESS";
|
case UV_EACCES: return "EACCES";
|
||||||
case UV_EAGAIN: return "EAGAIN";
|
case UV_EAGAIN: return "EAGAIN";
|
||||||
case UV_EADDRINUSE: return "EADDRINUSE";
|
case UV_EADDRINUSE: return "EADDRINUSE";
|
||||||
case UV_EADDRNOTAVAIL: return "EADDRNOTAVAIL";
|
case UV_EADDRNOTAVAIL: return "EADDRNOTAVAIL";
|
||||||
|
4
deps/uv/src/win/error.c
vendored
4
deps/uv/src/win/error.c
vendored
@ -90,8 +90,8 @@ uv_err_code uv_translate_sys_error(int sys_errno) {
|
|||||||
case ERROR_SUCCESS: return UV_OK;
|
case ERROR_SUCCESS: return UV_OK;
|
||||||
case ERROR_FILE_NOT_FOUND: return UV_ENOENT;
|
case ERROR_FILE_NOT_FOUND: return UV_ENOENT;
|
||||||
case ERROR_PATH_NOT_FOUND: return UV_ENOENT;
|
case ERROR_PATH_NOT_FOUND: return UV_ENOENT;
|
||||||
case ERROR_NOACCESS: return UV_EACCESS;
|
case ERROR_NOACCESS: return UV_EACCES;
|
||||||
case WSAEACCES: return UV_EACCESS;
|
case WSAEACCES: return UV_EACCES;
|
||||||
case ERROR_ADDRESS_ALREADY_ASSOCIATED: return UV_EADDRINUSE;
|
case ERROR_ADDRESS_ALREADY_ASSOCIATED: return UV_EADDRINUSE;
|
||||||
case WSAEADDRINUSE: return UV_EADDRINUSE;
|
case WSAEADDRINUSE: return UV_EADDRINUSE;
|
||||||
case WSAEADDRNOTAVAIL: return UV_EADDRNOTAVAIL;
|
case WSAEADDRNOTAVAIL: return UV_EADDRNOTAVAIL;
|
||||||
|
2
deps/uv/src/win/pipe.c
vendored
2
deps/uv/src/win/pipe.c
vendored
@ -362,7 +362,7 @@ int uv_pipe_bind(uv_pipe_t* handle, const char* name) {
|
|||||||
if (errno == ERROR_ACCESS_DENIED) {
|
if (errno == ERROR_ACCESS_DENIED) {
|
||||||
uv__set_error(loop, UV_EADDRINUSE, errno);
|
uv__set_error(loop, UV_EADDRINUSE, errno);
|
||||||
} else if (errno == ERROR_PATH_NOT_FOUND || errno == ERROR_INVALID_NAME) {
|
} else if (errno == ERROR_PATH_NOT_FOUND || errno == ERROR_INVALID_NAME) {
|
||||||
uv__set_error(loop, UV_EACCESS, errno);
|
uv__set_error(loop, UV_EACCES, errno);
|
||||||
} else {
|
} else {
|
||||||
uv__set_sys_error(loop, errno);
|
uv__set_sys_error(loop, errno);
|
||||||
}
|
}
|
||||||
|
2
deps/uv/src/win/process.c
vendored
2
deps/uv/src/win/process.c
vendored
@ -1059,7 +1059,7 @@ static uv_err_t uv__kill(HANDLE process_handle, int signum) {
|
|||||||
DWORD status;
|
DWORD status;
|
||||||
uv_err_t err;
|
uv_err_t err;
|
||||||
|
|
||||||
if (signum == SIGTERM || signum == SIGKILL) {
|
if (signum == SIGTERM || signum == SIGKILL || signum == SIGINT) {
|
||||||
/* Kill the process. On Windows, killed processes normally return 1. */
|
/* Kill the process. On Windows, killed processes normally return 1. */
|
||||||
if (TerminateProcess(process_handle, 1)) {
|
if (TerminateProcess(process_handle, 1)) {
|
||||||
err = uv_ok_;
|
err = uv_ok_;
|
||||||
|
3
deps/uv/test/test-list.h
vendored
3
deps/uv/test/test-list.h
vendored
@ -55,6 +55,7 @@ TEST_DECLARE (pipe_bind_error_addrinuse)
|
|||||||
TEST_DECLARE (pipe_bind_error_addrnotavail)
|
TEST_DECLARE (pipe_bind_error_addrnotavail)
|
||||||
TEST_DECLARE (pipe_bind_error_inval)
|
TEST_DECLARE (pipe_bind_error_inval)
|
||||||
TEST_DECLARE (pipe_listen_without_bind)
|
TEST_DECLARE (pipe_listen_without_bind)
|
||||||
|
TEST_DECLARE (pipe_connect_bad_name)
|
||||||
TEST_DECLARE (connection_fail)
|
TEST_DECLARE (connection_fail)
|
||||||
TEST_DECLARE (connection_fail_doesnt_auto_close)
|
TEST_DECLARE (connection_fail_doesnt_auto_close)
|
||||||
TEST_DECLARE (shutdown_eof)
|
TEST_DECLARE (shutdown_eof)
|
||||||
@ -124,6 +125,8 @@ HELPER_DECLARE (pipe_echo_server)
|
|||||||
|
|
||||||
|
|
||||||
TASK_LIST_START
|
TASK_LIST_START
|
||||||
|
TEST_ENTRY (pipe_connect_bad_name)
|
||||||
|
|
||||||
TEST_ENTRY (tty)
|
TEST_ENTRY (tty)
|
||||||
TEST_ENTRY (stdio_over_pipes)
|
TEST_ENTRY (stdio_over_pipes)
|
||||||
TEST_ENTRY (ipc_listen_before_write)
|
TEST_ENTRY (ipc_listen_before_write)
|
||||||
|
2
deps/uv/test/test-pipe-bind-error.c
vendored
2
deps/uv/test/test-pipe-bind-error.c
vendored
@ -84,7 +84,7 @@ TEST_IMPL(pipe_bind_error_addrnotavail) {
|
|||||||
r = uv_pipe_bind(&server, BAD_PIPENAME);
|
r = uv_pipe_bind(&server, BAD_PIPENAME);
|
||||||
|
|
||||||
ASSERT(r == -1);
|
ASSERT(r == -1);
|
||||||
ASSERT(uv_last_error(uv_default_loop()).code == UV_EACCESS);
|
ASSERT(uv_last_error(uv_default_loop()).code == UV_EACCES);
|
||||||
|
|
||||||
uv_close((uv_handle_t*)&server, close_cb);
|
uv_close((uv_handle_t*)&server, close_cb);
|
||||||
|
|
||||||
|
69
deps/uv/test/test-pipe-connect-error.c
vendored
Normal file
69
deps/uv/test/test-pipe-connect-error.c
vendored
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to
|
||||||
|
* deal in the Software without restriction, including without limitation the
|
||||||
|
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||||
|
* sell copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
* IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "uv.h"
|
||||||
|
#include "task.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# define BAD_PIPENAME "bad-pipe"
|
||||||
|
#else
|
||||||
|
# define BAD_PIPENAME "/path/to/unix/socket/that/really/should/not/be/there"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
static int close_cb_called = 0;
|
||||||
|
static int connect_cb_called = 0;
|
||||||
|
|
||||||
|
|
||||||
|
static void close_cb(uv_handle_t* handle) {
|
||||||
|
ASSERT(handle != NULL);
|
||||||
|
close_cb_called++;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void connect_cb(uv_connect_t* connect_req, int status) {
|
||||||
|
ASSERT(status == -1);
|
||||||
|
ASSERT(uv_last_error(uv_default_loop()).code == UV_ENOENT);
|
||||||
|
uv_close((uv_handle_t*)connect_req->handle, close_cb);
|
||||||
|
connect_cb_called++;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
TEST_IMPL(pipe_connect_bad_name) {
|
||||||
|
uv_pipe_t client;
|
||||||
|
uv_connect_t req;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
r = uv_pipe_init(uv_default_loop(), &client, 0);
|
||||||
|
ASSERT(r == 0);
|
||||||
|
uv_pipe_connect(&req, &client, BAD_PIPENAME, connect_cb);
|
||||||
|
ASSERT(r == 0);
|
||||||
|
|
||||||
|
uv_run(uv_default_loop());
|
||||||
|
|
||||||
|
ASSERT(close_cb_called == 1);
|
||||||
|
ASSERT(connect_cb_called == 1);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
1
deps/uv/uv.gyp
vendored
1
deps/uv/uv.gyp
vendored
@ -296,6 +296,7 @@
|
|||||||
'test/test-pass-always.c',
|
'test/test-pass-always.c',
|
||||||
'test/test-ping-pong.c',
|
'test/test-ping-pong.c',
|
||||||
'test/test-pipe-bind-error.c',
|
'test/test-pipe-bind-error.c',
|
||||||
|
'test/test-pipe-connect-error.c',
|
||||||
'test/test-ref.c',
|
'test/test-ref.c',
|
||||||
'test/test-shutdown-eof.c',
|
'test/test-shutdown-eof.c',
|
||||||
'test/test-spawn.c',
|
'test/test-spawn.c',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user