3 files changed, 41 insertions, 6 deletions

diff --git a/apps/nc/compat/accept4.c b/apps/nc/compat/accept4.c
index dca42e9..7818bc0 100644
--- a/apps/nc/compat/accept4.c
+++ b/apps/nc/compat/accept4.c
@@ -5,12 +5,18 @@ int
 accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags)
 {
         int rets = accept(s, addr, addrlen);
+        int fl;
         if (rets == -1)
                 return rets;
 
         if (flags & SOCK_CLOEXEC) {
-                flags = fcntl(rets, F_GETFD);
-                fcntl(rets, F_SETFD, flags | FD_CLOEXEC);
+                fl = fcntl(rets, F_GETFD);
+                fcntl(rets, F_SETFD, fl | FD_CLOEXEC);
+        }
+
+        if (flags & SOCK_NONBLOCK) {
+                fl = fcntl(rets, F_GETFL);
+                fcntl(rets, F_SETFL, fl | O_NONBLOCK);
         }
 
         return rets;
diff --git a/apps/nc/compat/readpassphrase.c b/apps/nc/compat/readpassphrase.c
index f3aa248..2a1e9ef 100644
--- a/apps/nc/compat/readpassphrase.c
+++ b/apps/nc/compat/readpassphrase.c
@@ -94,6 +94,8 @@ restart:
                 }
                 input = STDIN_FILENO;
                 output = STDERR_FILENO;
+        } else {
+                (void)fcntl(input, F_SETFD, FD_CLOEXEC);
         }
 
         /*
diff --git a/apps/openssl/compat/poll_win.c b/apps/openssl/compat/poll_win.c
index 30f6b60..70a7d06 100644
--- a/apps/openssl/compat/poll_win.c
+++ b/apps/openssl/compat/poll_win.c
@@ -73,6 +73,8 @@ compute_select_revents(int fd, short events,
                         rc |= POLLHUP;
                 else if (conn_has_oob_data(fd))
                         rc |= POLLRDBAND | POLLPRI;
+                else
+                        rc |= POLLERR;
         }
 
         return rc;
@@ -152,6 +154,9 @@ wsa_select_errno(int err)
         case WSAENETDOWN:
                 errno = ENOMEM;
                 break;
+        default:
+                errno = EIO;
+                break;
         }
         return -1;
 }
@@ -166,6 +171,7 @@ poll(struct pollfd *pfds, nfds_t nfds, int timeout_ms)
          * select machinery
          */
         fd_set rfds, wfds, efds;
+        fd_set rfds_in, wfds_in, efds_in;
         int rc;
         int num_sockets;
 
@@ -249,15 +255,36 @@ poll(struct pollfd *pfds, nfds_t nfds, int timeout_ms)
         wait_rc = WAIT_FAILED;
 
         looptime_ms = (timeout_ms > 100 || timeout_ms == -1) ? 100 : timeout_ms;
-        if (timeout_ms == -1)
-                timeout_ms = INFINITE;
+
+        /*
+         * select() clears every descriptor that is not ready from the
+         * fd_sets, so a pass that times out leaves them empty. Keep a
+         * pristine copy and restore it before each select(), otherwise the
+         * next pass hands select() three empty sets and Windows fails it with
+         * WSAEINVAL instead of waiting out the remaining timeout.
+         */
+        rfds_in = rfds;
+        wfds_in = wfds;
+        efds_in = efds;
 
         do {
                 TIMEVAL tv;
+
+                /*
+                 * Cap the wait at the time remaining so the final pass
+                 * does not overshoot the requested timeout.
+                 */
+                if (timeout_ms != -1 && timeout_ms - timespent_ms < looptime_ms)
+                        looptime_ms = timeout_ms - timespent_ms;
+
                 tv.tv_sec = 0;
                 tv.tv_usec = looptime_ms * 1000;
                 int handle_signaled = 0;
 
+                rfds = rfds_in;
+                wfds = wfds_in;
+                efds = efds_in;
+
                 /*
                  * Check if any file handles have signaled
                  */
@@ -280,7 +307,7 @@ poll(struct pollfd *pfds, nfds_t nfds, int timeout_ms)
                 /*
                  * If we signaled on a file handle, don't wait on the sockets.
                  */
-                if (wait_rc >= WAIT_OBJECT_0 &&
+                if (num_handles && wait_rc >= WAIT_OBJECT_0 &&
                     (wait_rc <= WAIT_OBJECT_0 + num_handles - 1)) {
                         tv.tv_usec = 0;
                         handle_signaled = 1;
@@ -298,7 +325,7 @@ poll(struct pollfd *pfds, nfds_t nfds, int timeout_ms)
 
                 timespent_ms += looptime_ms;
 
-        } while (timespent_ms < timeout_ms);
+        } while (timeout_ms == -1 || timespent_ms < timeout_ms);
 
         rc = 0;
         num_handles = 0;