Fix connect on win32

We should not wait before calling connect for non-blocking connect.
Also, use the right error code for the nonblocking pending case on win32.
This commit is contained in:
Alexander Larsson 2009-05-20 16:28:20 +02:00
parent bb66fdcce3
commit 14d53dcfa8

View File

@ -1418,11 +1418,6 @@ g_socket_connect (GSocket *socket,
while (1)
{
if (socket->priv->blocking &&
!g_socket_condition_wait (socket,
G_IO_IN, NULL, error))
return FALSE;
if (connect (socket->priv->fd, (struct sockaddr *) &buffer,
g_socket_address_get_native_size (address)) < 0)
{
@ -1434,7 +1429,7 @@ g_socket_connect (GSocket *socket,
#ifndef G_OS_WIN32
if (errsv == EINPROGRESS)
#else
if (errsv == WSAEINPROGRESS)
if (errsv == WSAEWOULDBLOCK)
#endif
{
if (socket->priv->blocking)