mirror of
https://github.com/lunarmodules/luasocket.git
synced 2025-04-23 17:06:47 +02:00
Merge 39a8b34e4afbb42c37fa89fc2dcc8537d682c5ef into e3ca4a767a68d127df548d82669aba3689bd84f4
This commit is contained in:
commit
62e3578bfd
@ -127,7 +127,19 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
|
||||
if (connect(*ps, addr, len) == 0) return IO_DONE;
|
||||
/* make sure the system is trying to connect */
|
||||
err = WSAGetLastError();
|
||||
|
||||
if (err == WSAEISCONN) return IO_DONE; // already connected?
|
||||
|
||||
// hotfix for nonblocking, slow TCP connections not returning instantly
|
||||
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms737625(v=vs.85).aspx
|
||||
// "Note In order to preserve backward compatibility, this error is reported as WSAEINVAL to Windows Sockets 1.1 applications that link to either Winsock.dll or Wsock32.dll."
|
||||
// The only other valid reason to get WSAINVAL is that: The parameter s is a listening socket. So we hope that doesn't happen here.
|
||||
if (err == WSAEINVAL) {
|
||||
return WSAEALREADY;
|
||||
}
|
||||
|
||||
if (err != WSAEWOULDBLOCK && err != WSAEINPROGRESS) return err;
|
||||
|
||||
/* zero timeout case optimization */
|
||||
if (timeout_iszero(tm)) return IO_TIMEOUT;
|
||||
/* we wait until something happens */
|
||||
|
Loading…
x
Reference in New Issue
Block a user