diff options
| author | harald.oehlmann@elmicron.de <oehhar> | 2014-05-30 10:36:01 (GMT) |
|---|---|---|
| committer | harald.oehlmann@elmicron.de <oehhar> | 2014-05-30 10:36:01 (GMT) |
| commit | 02720d22b3b12ecdaa9537ccaff70d809425a34c (patch) | |
| tree | 447d0d68cfd0525c9be8a9289040710472b7b782 | |
| parent | 08237c16c4c74af512b8a37e3e94d1dc76797140 (diff) | |
| parent | 435e8d7b7c2c636117ca79fb6104e33e1d5dc1aa (diff) | |
| download | tcl-02720d22b3b12ecdaa9537ccaff70d809425a34c.zip tcl-02720d22b3b12ecdaa9537ccaff70d809425a34c.tar.gz tcl-02720d22b3b12ecdaa9537ccaff70d809425a34c.tar.bz2 | |
win socket -async: do not loose connect notification by temporarily stop connect monitoring. Bug [336441ed59]
| -rw-r--r-- | win/tclWinSock.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c index e18a3dd..8f565b9 100644 --- a/win/tclWinSock.c +++ b/win/tclWinSock.c @@ -1239,13 +1239,17 @@ WaitForSocketEvent( /* * Reset WSAAsyncSelect so we have a fresh set of events pending. + * Don't do that if we are waiting for a connect as we may miss + * a connect (bug 336441ed59). */ - SendMessage(tsdPtr->hwnd, SOCKET_SELECT, (WPARAM) UNSELECT, - (LPARAM) infoPtr); - - SendMessage(tsdPtr->hwnd, SOCKET_SELECT, (WPARAM) SELECT, - (LPARAM) infoPtr); + if ( 0 == (events & FD_CONNECT) ) { + SendMessage(tsdPtr->hwnd, SOCKET_SELECT, (WPARAM) UNSELECT, + (LPARAM) infoPtr); + + SendMessage(tsdPtr->hwnd, SOCKET_SELECT, (WPARAM) SELECT, + (LPARAM) infoPtr); + } while (1) { if (infoPtr->lastError) { @@ -2409,11 +2413,15 @@ SocketProc( case SOCKET_SELECT: infoPtr = (SocketInfo *) lParam; if (wParam == SELECT) { + /* + * Start notification by windows messages on socket events + */ + WSAAsyncSelect(infoPtr->socket, hwnd, SOCKET_MESSAGE, infoPtr->selectEvents); } else { /* - * Clear the selection mask + * UNSELECT: Clear the selection mask */ WSAAsyncSelect(infoPtr->socket, hwnd, 0, 0); |