svn commit: r1671513 - /apr/apr/trunk/poll/unix/poll.c

[tr...@apache.org]

Author: trawick
Date: Mon Apr  6 11:26:42 2015
New Revision: 1671513

URL: http://svn.apache.org/r1671513
Log:
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.

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=1671513&r1=1671512&r2=1671513&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/poll.c (original)
+++ apr/apr/trunk/poll/unix/poll.c Mon Apr  6 11:26:42 2015
@@ -290,7 +290,9 @@ static apr_status_t impl_pollset_poll(ap
                 }
             }
         }
-        *num = j;
+        if ((*num = j)) { /* any event besides wakeup pipe? */
+            rv = APR_SUCCESS;
+        }
     }
     if (descriptors && (*num))
         *descriptors = pollset->p->result_set;