diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-12 04:59:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-12 04:59:59 +0000 |
| commit | 052282b2d174632c62327a1ccd2d839e8ab3ec9e (patch) | |
| tree | 9604f20f0dc601f1b8f34d0adbd9fcdc57140b2d /poll/unix/epoll.c | |
| parent | Releasing progress-linux version 1.7.2-3.2~progress7.99u1. (diff) | |
| download | apr-052282b2d174632c62327a1ccd2d839e8ab3ec9e.tar.xz apr-052282b2d174632c62327a1ccd2d839e8ab3ec9e.zip | |
Merging upstream version 1.7.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'poll/unix/epoll.c')
| -rw-r--r-- | poll/unix/epoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/poll/unix/epoll.c b/poll/unix/epoll.c index 4ab03f6..ad3cc0b 100644 --- a/poll/unix/epoll.c +++ b/poll/unix/epoll.c @@ -261,7 +261,7 @@ static apr_status_t impl_pollset_poll(apr_pollset_t *pollset, *num = 0; if (timeout > 0) { - timeout /= 1000; + timeout = (timeout + 999) / 1000; } ret = epoll_wait(pollset->p->epoll_fd, pollset->p->pollset, pollset->nalloc, @@ -442,7 +442,7 @@ static apr_status_t impl_pollcb_poll(apr_pollcb_t *pollcb, apr_status_t rv = APR_SUCCESS; if (timeout > 0) { - timeout /= 1000; + timeout = (timeout + 999) / 1000; } ret = epoll_wait(pollcb->fd, pollcb->pollset.epoll, pollcb->nalloc, |