summaryrefslogtreecommitdiff
path: root/poll
diff options
context:
space:
mode:
authorniq <niq@13f79535-47bb-0310-9956-ffa450edef68>2008-03-27 00:46:05 +0000
committerniq <niq@13f79535-47bb-0310-9956-ffa450edef68>2008-03-27 00:46:05 +0000
commitc01591be2de13c6f003d73b8606993700366d20d (patch)
tree06d2f4a7a194703ab6a9281dc269c826d8629b3a /poll
parent59061816309c9edce4aaade87fdf335fd6318e51 (diff)
downloadlibapr-c01591be2de13c6f003d73b8606993700366d20d.tar.gz
PR 42580 - fix return value when apr_pollset_poll interrupted
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@641661 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
-rw-r--r--poll/unix/port.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/poll/unix/port.c b/poll/unix/port.c
index 51783d40b..05848d618 100644
--- a/poll/unix/port.c
+++ b/poll/unix/port.c
@@ -295,12 +295,7 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
if (ret == -1) {
(*num) = 0;
- if (errno == ETIME || errno == EINTR) {
- rv = APR_TIMEUP;
- }
- else {
- rv = APR_EGENERAL;
- }
+ rv = apr_get_netos_error();
}
else if (nget == 0) {
rv = APR_TIMEUP;