From 4d07d7cabe1a865812cf5d95a84557880e3c3096 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@fastmq.com>
Date: Wed, 9 Sep 2009 10:08:46 +0200
Subject: fix of async connect on win32
---
src/tcp_connecter.cpp | 4 +++-
src/zmq_connecter.cpp | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
index 22caafb..7058648 100644
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -180,8 +180,10 @@ int zmq::tcp_connecter_t::open ()
return 0;
// Asynchronous connect was launched.
- if (rc == -1 && errno == EINPROGRESS)
+ if (rc == -1 && errno == EINPROGRESS) {
+ errno = EAGAIN;
return -1;
+ }
// Error occured.
int err = errno;
diff --git a/src/zmq_connecter.cpp b/src/zmq_connecter.cpp
index 1ab4a14..be88bff 100644
--- a/src/zmq_connecter.cpp
+++ b/src/zmq_connecter.cpp
@@ -100,7 +100,7 @@ void zmq::zmq_connecter_t::start_connecting ()
}
// Connection establishment may be dealyed. Poll for its completion.
- else if (rc == -1 && errno == EINPROGRESS) {
+ else if (rc == -1 && errno == EAGAIN) {
handle = add_fd (tcp_connecter.get_fd ());
handle_valid = true;
set_pollout (handle);
--
cgit v1.2.3