Backport fix to PR#42580 - return correct errno when poll interrupted

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@648007 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 6 deletions

diff --git a/CHANGES b/CHANGES
index cbce472d0..336f60a55 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.2.13
 
+  *) Fix return value when apr_pollset_poll interrupted.
+     PR 42580 [Basant Kumar Kukreja <basant.kukreja sun.com>]
+
   *) z/OS: return standard apr_status_t codes from apr_dso_load()
      and apr_dso_sym().  [David Jones <oscaremma gmail.com>]
 
diff --git a/poll/unix/port.c b/poll/unix/port.c
index 31f48ceeb..e01bdfda3 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;