summaryrefslogtreecommitdiff
path: root/cppe/src/TcpTransport/Acceptor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cppe/src/TcpTransport/Acceptor.cpp')
-rw-r--r--cppe/src/TcpTransport/Acceptor.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/cppe/src/TcpTransport/Acceptor.cpp b/cppe/src/TcpTransport/Acceptor.cpp
index eae64c0a4aa..a2d0f4b365f 100644
--- a/cppe/src/TcpTransport/Acceptor.cpp
+++ b/cppe/src/TcpTransport/Acceptor.cpp
@@ -66,7 +66,14 @@ TransceiverPtr
IceInternal::Acceptor::accept()
{
SOCKET fd = doAccept(_fd);
+#if !defined(_WIN32) || defined(ICEE_USE_SOCKET_TIMEOUT)
+ //
+ // TODO: We can't use blocking sockets on Windows yet because
+ // the transceiver is using WSAEventSelect (which doesn't play
+ // well with blocking sockets).
+ //
setBlock(fd, true);
+#endif
if(_traceLevels->network >= 1)
{