summaryrefslogtreecommitdiff
path: root/deps/uv/src/unix/tcp.c
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2012-07-02 00:07:11 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2012-07-02 00:07:11 +0200
commita25a27817fc8796edd9181122e9aab7ab516751a (patch)
treed3d2ef32fe5096722b23b1e7c892abb75956f2e9 /deps/uv/src/unix/tcp.c
parentb53cd9798f96637a8bb60ef2391f21bd017f071d (diff)
downloadandroid-node-v8-a25a27817fc8796edd9181122e9aab7ab516751a.tar.gz
android-node-v8-a25a27817fc8796edd9181122e9aab7ab516751a.tar.bz2
android-node-v8-a25a27817fc8796edd9181122e9aab7ab516751a.zip
deps: upgrade libuv to cc1b3de
Diffstat (limited to 'deps/uv/src/unix/tcp.c')
-rw-r--r--deps/uv/src/unix/tcp.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/deps/uv/src/unix/tcp.c b/deps/uv/src/unix/tcp.c
index 1aeba0efcf..233be82514 100644
--- a/deps/uv/src/unix/tcp.c
+++ b/deps/uv/src/unix/tcp.c
@@ -109,17 +109,8 @@ static int uv__connect(uv_connect_t* req,
while (r == -1 && errno == EINTR);
if (r == -1) {
- if (errno == EINPROGRESS) {
- /* Not an error. However, we need to keep the event loop from spinning
- * while the connection is in progress. Artificially start the handle
- * and stop it again in uv__stream_connect() in stream.c. Yes, it's a
- * hack but there's no good alternative, the v0.8 ABI is frozen.
- */
- if (!uv__is_active(handle)) {
- handle->flags |= UV_TCP_CONNECTING;
- uv__handle_start(handle);
- }
- }
+ if (errno == EINPROGRESS)
+ ; /* not an error */
else if (errno == ECONNREFUSED)
/* If we get a ECONNREFUSED wait until the next tick to report the
* error. Solaris wants to report immediately--other unixes want to