Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anevilyak+mmlr:

Browse Source 
accept() is supposed to return B_WOULD_BLOCK when SO_NONBLOCK is set.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35154 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2010-01-19 04:31:35 +00:00
parent 3632eeedb9
commit 2416d6ae42
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
View File

@ -673,8 +673,12 @@ TCPEndpoint::Accept(struct net_socket** _acceptedSocket)
status = acquire_sem_etc(fAcceptSemaphore, 1, B_ABSOLUTE_TIMEOUT
| B_CAN_INTERRUPT, timeout);
if (status != B_OK)
if (status != B_OK) {
if (status == B_TIMED_OUT && socket->receive.timeout == 0)
return B_WOULD_BLOCK;
return status;
}
locker.Lock();
status = gSocketModule->dequeue_connected(socket, _acceptedSocket);