You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2015/04/05 14:50:54 UTC
svn commit: r1671389 - /apr/apr/trunk/poll/unix/poll.c
Author: trawick
Date: Sun Apr 5 12:50:54 2015
New Revision: 1671389
URL: http://svn.apache.org/r1671389
Log:
poll() implementation of apr_pollset_poll(): Return APR_EINTR as appropriate.
(APR_SUCCESS was returned instead in that scenario.)
Modified:
apr/apr/trunk/poll/unix/poll.c
Modified: apr/apr/trunk/poll/unix/poll.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/poll.c?rev=1671389&r1=1671388&r2=1671389&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/poll.c (original)
+++ apr/apr/trunk/poll/unix/poll.c Sun Apr 5 12:50:54 2015
@@ -261,7 +261,7 @@ static apr_status_t impl_pollset_poll(ap
}
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(ap
}
}
}
- if (((*num) = j) > 0)
- rv = APR_SUCCESS;
+ *num = j;
}
if (descriptors && (*num))
*descriptors = pollset->p->result_set;