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:
Sebastian Dröge 2020-12-24 09:08:40 +00:00
commit 7ad7f55888

View File

@ -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,