diff options
| author | Nils Maier <maierman@web.de> | 2017-07-31 15:41:40 +0200 |
|---|---|---|
| committer | Nils Maier <maierman@web.de> | 2017-08-28 18:19:04 +0200 |
| commit | 1fe6cc73563c3804a0c70947aa76fd50650f1abb (patch) | |
| tree | 4d7678e7dea81c5473dbf273a45e1293debdfa76 /src/SelectEventPoll.h | |
| parent | 527093acc72945a34fb01de970bae8d203b7928e (diff) | |
Windows: pass writefds also as exceptfds to select()
winsock notifies connect() failures on exceptfds instead of writefds.
Fixes GH-969
Fixes GH-975
Diffstat (limited to 'src/SelectEventPoll.h')
| -rw-r--r-- | src/SelectEventPoll.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/SelectEventPoll.h b/src/SelectEventPoll.h index 311d4134..d5753095 100644 --- a/src/SelectEventPoll.h +++ b/src/SelectEventPoll.h @@ -151,6 +151,11 @@ private: fd_set rfdset_; fd_set wfdset_; sock_t fdmax_; +#ifdef __MINGW32__ + // Winsock select() doesn't work if no socket is in FD_SET. We add + // this dummy socket to work around this problem + sock_t dummySocket_; +#endif // __MINGW32__ typedef std::map<sock_t, SocketEntry> SocketEntrySet; SocketEntrySet socketEntries_; @@ -161,12 +166,6 @@ private: AsyncNameResolverEntrySet nameResolverEntries_; #endif // ENABLE_ASYNC_DNS -#ifdef __MINGW32__ - // Winsock select() doesn't work if no socket is in FD_SET. We add - // this dummy socket to work around this problem - sock_t dummySocket_; -#endif // __MINGW32__ - void updateFdSet(); public: |