Commit 7ad7f558 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵
Browse files

Merge branch 'master' into 'master'

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

See merge request !1827
parents d48e22e4 43b13d7a
Pipeline #241212 failed with stages
in 13 minutes and 43 seconds
......@@ -5475,10 +5475,10 @@ g_socket_receive_message_with_timeout (GSocket *socket,
if (errsv == WSAEINTR)
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,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment