debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix waitForDataEx's return value for an open connection and a zero timeout.

Browse source 
IOMode.once causes the read() to return with IOStatus.wouldBlock immediately, which previously resulted in erroneously reporting WaitForDataStatus.noModeData instead of timeout.

See vibe-d/vibe.d#2483
This commit is contained in:
Sönke Ludwig 2020-10-15 13:13:15 +02:00
parent 4357b32375
commit ae6506289a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/vibe/core/net.d
View file

@ -612,7 +612,10 @@ mixin(tracer);
asyncAwaitAny!(true, waiter)(timeout); asyncAwaitAny!(true, waiter)(timeout);
if (!m_context) return WaitForDataStatus.noMoreData; if (!m_context) return WaitForDataStatus.noMoreData;
if (cancelled) return WaitForDataStatus.timeout; // NOTE: for IOMode.immediate, no actual timeout occurrs, but the read
// fails immediately with wouldBlock
if (cancelled || status == IOStatus.wouldBlock)
return WaitForDataStatus.timeout;
logTrace("Socket %s, read %s bytes: %s", m_socket, nbytes, status); logTrace("Socket %s, read %s bytes: %s", m_socket, nbytes, status);