Revert r1671389; apr_pollset_poll() should return APR_SUCCESS

and the real event if a real event occurs AND apr_pollset_wakeup()
is called before apr_pollset_poll() is called and/or awakened.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1671513 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 1 deletions

diff --git a/poll/unix/poll.c b/poll/unix/poll.c
index b9c41f38b..9f7ef2410 100644
--- a/poll/unix/poll.c
+++ b/poll/unix/poll.c
@@ -290,7 +290,9 @@ static apr_status_t impl_pollset_poll(apr_pollset_t *pollset,
                 }
             }
         }
-        *num = j;
+        if ((*num = j)) { /* any event besides wakeup pipe? */
+            rv = APR_SUCCESS;
+        }
     }
     if (descriptors && (*num))
         *descriptors = pollset->p->result_set;