mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
Merge branch 'master' into 'master'
Windows: fix FD_READ condition flag still set on recoverable UDP socket errors. See merge request GNOME/glib!1827
This commit is contained in:
commit
7ad7f55888
@ -5475,10 +5475,10 @@ g_socket_receive_message_with_timeout (GSocket *socket,
|
||||
if (errsv == WSAEINTR)
|
||||
continue;
|
||||
|
||||
win32_unset_event_mask (socket, FD_READ);
|
||||
|
||||
if (errsv == WSAEWOULDBLOCK)
|
||||
{
|
||||
win32_unset_event_mask (socket, FD_READ);
|
||||
|
||||
if (timeout_us != 0)
|
||||
{
|
||||
if (!block_on_timeout (socket, G_IO_IN, timeout_us,
|
||||
|
Loading…
Reference in New Issue
Block a user