Bug#29431134: MASTER : HANG IN SESSION CREATION TN INVALID HOST ON WINDOWS

Fixing timeout logic once more. Since 0 means no timeout, we pass 1 (microsecond) in case there is
no time left.

Author: rsomla1

cdk/foundation/socket_detail.cc

@@ -44,6 +44,7 @@ PUSH_SYS_WARNINGS_CDK
 #include <limits>
 #include <chrono>
 #include <sstream>
+
 #ifndef _WIN32
 #include <arpa/inet.h>
 #include <signal.h>
@@ -613,7 +614,7 @@ Socket connect(const char *host_name, unsigned short port,
 
           int select_result = poll_one(
             socket, POLL_MODE_CONNECT, true,
-            timeout_usec > 0 && timeout > 0 ? timeout : 0
+            0 == timeout_usec ? 0 : timeout > 0 ? timeout : 1
           );
 
           if (select_result == 0 && (timeout_usec > 0) &&
@@ -764,6 +765,7 @@ Socket listen_and_accept(unsigned short port)
   return client;
 }
 
+
 int poll_one(Socket socket, Poll_mode mode, bool wait,
                uint64_t timeout_usec)
 {
@@ -796,7 +798,8 @@ DIAGNOSTIC_POP_CDK
 
   //milliseconds
   int timeout =
-    !wait ? 0 : timeout_usec > 0 ? static_cast<int>(timeout_usec / 1000) : -1;
+    !wait ? 0
+    : timeout_usec > 0 ? static_cast<int>((1000+timeout_usec) / 1000) : -1;
 
 #ifdef _WIN32
   int result = ::WSAPoll(&fds, 1, timeout);