diff options
| -rw-r--r-- | win/tclWinSock.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c index 9fa01c9..badfc7a 100644 --- a/win/tclWinSock.c +++ b/win/tclWinSock.c @@ -1211,6 +1211,15 @@ WaitForSocketEvent( break; } else if (infoPtr->readyEvents & events) { break; + } else if ((events == FD_CONNECT) && + !(infoPtr->flags & SOCKET_ASYNC_CONNECT)) { + /* When waiting for FD_CONNECT Windows may not deliver this event, + * causing us to get stuck. However, SocketProc()'s SOCKET_MESSAGE + * handler has special code which detects this and resets the + * infoPtr->flags async bit anyway (See (xxx)). That we can detect + * here and break the loop as if we had gotten FD_CONNECT. + */ + break; } else if (infoPtr->flags & SOCKET_ASYNC) { *errorCodePtr = EWOULDBLOCK; result = 0; @@ -2327,6 +2336,7 @@ SocketProc( } } + /* (xxx) See corresponding marker in WaitForSocketEvent as well */ if (infoPtr->flags & SOCKET_ASYNC_CONNECT) { infoPtr->flags &= ~(SOCKET_ASYNC_CONNECT); if (error != ERROR_SUCCESS) { |