luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-14 05:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Windows: fix FD_READ condition flag still set on recoverable UDP socket errors.

See merge request GNOME/glib!1827
This commit is contained in:
Sebastian Dröge 2020-12-24 09:08:40 +00:00
commit 7ad7f55888
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gsocket.c
View File

@ -5475,10 +5475,10 @@ g_socket_receive_message_with_timeout (GSocket *socket,
if (errsv == WSAEINTR) if (errsv == WSAEINTR)
continue; continue;
win32_unset_event_mask (socket, FD_READ);
if (errsv == WSAEWOULDBLOCK) if (errsv == WSAEWOULDBLOCK)
{ {
win32_unset_event_mask (socket, FD_READ);
if (timeout_us != 0) if (timeout_us != 0)
{ {
if (!block_on_timeout (socket, G_IO_IN, timeout_us, if (!block_on_timeout (socket, G_IO_IN, timeout_us,