Merge r1671389 from trunk:

poll() implementation of apr_pollset_poll(): Return APR_EINTR as appropriate.
(APR_SUCCESS was returned instead in that scenario.)


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1671390 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 3 deletions

diff --git a/poll/unix/poll.c b/poll/unix/poll.c
index d7a436fd9..0c32ad901 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;