luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix connect on win32

Browse Source 
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
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gsocket.c
View File

@ -1418,11 +1418,6 @@ g_socket_connect (GSocket *socket,
while (1) 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, if (connect (socket->priv->fd, (struct sockaddr *) &buffer,
g_socket_address_get_native_size (address)) < 0) g_socket_address_get_native_size (address)) < 0)
{ {
@ -1434,7 +1429,7 @@ g_socket_connect (GSocket *socket,
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
if (errsv == EINPROGRESS) if (errsv == EINPROGRESS)
#else #else
if (errsv == WSAEINPROGRESS) if (errsv == WSAEWOULDBLOCK)
#endif #endif
{ {
if (socket->priv->blocking) if (socket->priv->blocking)