From cf78d04ae29757e1756e5538cb64c268acdec809 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Thu, 3 Nov 2011 16:30:58 -0700 Subject: [PATCH] Upgrade libuv to 9c7ed0d Fixes test-net-pipe-connect-errors.js on UNIX. See #2001. --- deps/uv/common.gypi | 1 - deps/uv/include/uv.h | 2 +- deps/uv/src/unix/error.c | 6 ++- deps/uv/src/unix/pipe.c | 2 +- deps/uv/src/uv-common.c | 2 +- deps/uv/src/win/error.c | 4 +- deps/uv/src/win/pipe.c | 2 +- deps/uv/src/win/process.c | 2 +- deps/uv/test/test-ipc.c | 2 +- deps/uv/test/test-list.h | 3 ++ deps/uv/test/test-pipe-bind-error.c | 2 +- deps/uv/test/test-pipe-connect-error.c | 69 ++++++++++++++++++++++++++ deps/uv/uv.gyp | 1 + 13 files changed, 86 insertions(+), 12 deletions(-) create mode 100644 deps/uv/test/test-pipe-connect-error.c diff --git a/deps/uv/common.gypi b/deps/uv/common.gypi index 31d6b64288..e0eb76d267 100644 --- a/deps/uv/common.gypi +++ b/deps/uv/common.gypi @@ -152,7 +152,6 @@ 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics - 'GCC_VERSION': '4.2', 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof 'MACOSX_DEPLOYMENT_TARGET': '10.4', # -mmacosx-version-min=10.4 'PREBINDING': 'NO', # No -Wl,-prebind diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index fda459f021..9d661e5149 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -72,7 +72,7 @@ typedef enum { UV_OK = 0, UV_EOF, UV_EADDRINFO, - UV_EACCESS, + UV_EACCES, UV_EAGAIN, UV_EADDRINUSE, UV_EADDRNOTAVAIL, diff --git a/deps/uv/src/unix/error.c b/deps/uv/src/unix/error.c index e7d7c1ff98..6f49516d67 100644 --- a/deps/uv/src/unix/error.c +++ b/deps/uv/src/unix/error.c @@ -59,8 +59,9 @@ void uv_fatal_error(const int errorno, const char* syscall) { static int uv__translate_lib_error(int code) { switch (code) { case UV_ENOSYS: return ENOSYS; + case UV_ENOTSOCK: return ENOTSOCK; case UV_ENOENT: return ENOENT; - case UV_EACCESS: return EACCES; + case UV_EACCES: return EACCES; case UV_EAFNOSUPPORT: return EAFNOSUPPORT; case UV_EBADF: return EBADF; case UV_EPIPE: return EPIPE; @@ -89,8 +90,9 @@ uv_err_code uv_translate_sys_error(int sys_errno) { switch (sys_errno) { case 0: return UV_OK; case ENOSYS: return UV_ENOSYS; + case ENOTSOCK: return UV_ENOTSOCK; case ENOENT: return UV_ENOENT; - case EACCES: return UV_EACCESS; + case EACCES: return UV_EACCES; case EAFNOSUPPORT: return UV_EAFNOSUPPORT; case EBADF: return UV_EBADF; case EPIPE: return UV_EPIPE; diff --git a/deps/uv/src/unix/pipe.c b/deps/uv/src/unix/pipe.c index dabdcd6cff..47de1b3b62 100644 --- a/deps/uv/src/unix/pipe.c +++ b/deps/uv/src/unix/pipe.c @@ -209,7 +209,7 @@ int uv_pipe_connect(uv_connect_t* req, while (r == -1 && errno == EINTR); if (r == -1) { - uv__set_sys_error(handle->loop, errno); + status = errno; uv__close(sockfd); goto out; } diff --git a/deps/uv/src/uv-common.c b/deps/uv/src/uv-common.c index 28f9cf6cb8..2302e05d02 100644 --- a/deps/uv/src/uv-common.c +++ b/deps/uv/src/uv-common.c @@ -57,7 +57,7 @@ const char* uv_err_name(uv_err_t err) { case UV_OK: return "OK"; case UV_EOF: return "EOF"; case UV_EADDRINFO: return "EADDRINFO"; - case UV_EACCESS: return "EACCESS"; + case UV_EACCES: return "EACCES"; case UV_EAGAIN: return "EAGAIN"; case UV_EADDRINUSE: return "EADDRINUSE"; case UV_EADDRNOTAVAIL: return "EADDRNOTAVAIL"; diff --git a/deps/uv/src/win/error.c b/deps/uv/src/win/error.c index 5b43a65fa6..1317ce5b6c 100644 --- a/deps/uv/src/win/error.c +++ b/deps/uv/src/win/error.c @@ -90,8 +90,8 @@ uv_err_code uv_translate_sys_error(int sys_errno) { case ERROR_SUCCESS: return UV_OK; case ERROR_FILE_NOT_FOUND: return UV_ENOENT; case ERROR_PATH_NOT_FOUND: return UV_ENOENT; - case ERROR_NOACCESS: return UV_EACCESS; - case WSAEACCES: return UV_EACCESS; + case ERROR_NOACCESS: return UV_EACCES; + case WSAEACCES: return UV_EACCES; case ERROR_ADDRESS_ALREADY_ASSOCIATED: return UV_EADDRINUSE; case WSAEADDRINUSE: return UV_EADDRINUSE; case WSAEADDRNOTAVAIL: return UV_EADDRNOTAVAIL; diff --git a/deps/uv/src/win/pipe.c b/deps/uv/src/win/pipe.c index 61281f0006..6fb8159e65 100644 --- a/deps/uv/src/win/pipe.c +++ b/deps/uv/src/win/pipe.c @@ -362,7 +362,7 @@ int uv_pipe_bind(uv_pipe_t* handle, const char* name) { if (errno == ERROR_ACCESS_DENIED) { uv__set_error(loop, UV_EADDRINUSE, errno); } 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 { uv__set_sys_error(loop, errno); } diff --git a/deps/uv/src/win/process.c b/deps/uv/src/win/process.c index 195db5014b..d433117f63 100644 --- a/deps/uv/src/win/process.c +++ b/deps/uv/src/win/process.c @@ -1059,7 +1059,7 @@ static uv_err_t uv__kill(HANDLE process_handle, int signum) { DWORD status; 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. */ if (TerminateProcess(process_handle, 1)) { err = uv_ok_; diff --git a/deps/uv/test/test-ipc.c b/deps/uv/test/test-ipc.c index d0c1abfbfd..0908879510 100644 --- a/deps/uv/test/test-ipc.c +++ b/deps/uv/test/test-ipc.c @@ -275,4 +275,4 @@ TEST_IMPL(listen_no_simultaneous_accepts) { return 0; } -#endif \ No newline at end of file +#endif diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h index 5b7db6c54c..d602def32c 100644 --- a/deps/uv/test/test-list.h +++ b/deps/uv/test/test-list.h @@ -55,6 +55,7 @@ TEST_DECLARE (pipe_bind_error_addrinuse) TEST_DECLARE (pipe_bind_error_addrnotavail) TEST_DECLARE (pipe_bind_error_inval) TEST_DECLARE (pipe_listen_without_bind) +TEST_DECLARE (pipe_connect_bad_name) TEST_DECLARE (connection_fail) TEST_DECLARE (connection_fail_doesnt_auto_close) TEST_DECLARE (shutdown_eof) @@ -124,6 +125,8 @@ HELPER_DECLARE (pipe_echo_server) TASK_LIST_START + TEST_ENTRY (pipe_connect_bad_name) + TEST_ENTRY (tty) TEST_ENTRY (stdio_over_pipes) TEST_ENTRY (ipc_listen_before_write) diff --git a/deps/uv/test/test-pipe-bind-error.c b/deps/uv/test/test-pipe-bind-error.c index 3443f19dc8..b84d20f1ea 100644 --- a/deps/uv/test/test-pipe-bind-error.c +++ b/deps/uv/test/test-pipe-bind-error.c @@ -84,7 +84,7 @@ TEST_IMPL(pipe_bind_error_addrnotavail) { r = uv_pipe_bind(&server, BAD_PIPENAME); 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); diff --git a/deps/uv/test/test-pipe-connect-error.c b/deps/uv/test/test-pipe-connect-error.c new file mode 100644 index 0000000000..6106cc4266 --- /dev/null +++ b/deps/uv/test/test-pipe-connect-error.c @@ -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 +#include + + +#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; +} diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp index b92760a31b..3dac47f133 100644 --- a/deps/uv/uv.gyp +++ b/deps/uv/uv.gyp @@ -296,6 +296,7 @@ 'test/test-pass-always.c', 'test/test-ping-pong.c', 'test/test-pipe-bind-error.c', + 'test/test-pipe-connect-error.c', 'test/test-ref.c', 'test/test-shutdown-eof.c', 'test/test-spawn.c',