merge r654046 from trunk/1.4.x

This is a follow-up patch for PR 43000 (r653953) which was
comitted to trunk but not 1.3.x back in May 2008.


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

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 450f88675..812ebae74 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.3.9
 
-
+  *) Add the remainder of this fix from trunk:
+     Fix Solaris poll failure.  PR 43000
+     [Henry Jen <henryjen ztune.net>]
 
 Changes for APR 1.3.8
 
diff --git a/poll/unix/port.c b/poll/unix/port.c
index 0ed710818..eeae05fd6 100644
--- a/poll/unix/port.c
+++ b/poll/unix/port.c
@@ -242,6 +242,9 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
                 APR_RING_REMOVE(ep, link);
                 APR_RING_INSERT_TAIL(&(pollset->dead_ring),
                                      ep, pfd_elem_t, link);
+                if (ENOENT == err) {
+                    rv = APR_SUCCESS;
+                }
                 break;
             }
         }