diff options
| author | Jeff Trawick <trawick@apache.org> | 2015-04-05 12:50:54 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2015-04-05 12:50:54 +0000 |
| commit | 7894814f111847b7b017f89e9c2a46f672059f81 (patch) | |
| tree | 67f5a33a543737d017fe20a5555b5e2e2ff9f1ea /poll | |
| parent | dfdce0417001cc18fb653c53c0d003e389498ada (diff) | |
| download | apr-7894814f111847b7b017f89e9c2a46f672059f81.tar.gz | |
poll() implementation of apr_pollset_poll(): Return APR_EINTR as appropriate.
(APR_SUCCESS was returned instead in that scenario.)
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1671389 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
| -rw-r--r-- | poll/unix/poll.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/poll/unix/poll.c b/poll/unix/poll.c index 0764d5f98..b9c41f38b 100644 --- a/poll/unix/poll.c +++ b/poll/unix/poll.c @@ -261,7 +261,7 @@ static apr_status_t impl_pollset_poll(apr_pollset_t *pollset, } ret = poll(pollset->p->pollset, pollset->nelts, timeout); #endif - (*num) = ret; + *num = 0; if (ret < 0) { return apr_get_netos_error(); } @@ -290,8 +290,7 @@ static apr_status_t impl_pollset_poll(apr_pollset_t *pollset, } } } - if (((*num) = j) > 0) - rv = APR_SUCCESS; + *num = j; } if (descriptors && (*num)) *descriptors = pollset->p->result_set; |