Fix a longstanding missunderstanding in our kqueue pollset code. It t…

…urns

out that the kqueue filter types are not bitfields, so checking for them
via & EVFILT_READ or & EVFILT_WRITE is inappropriate.

Test Fixes By: Joe Orton

* poll/unix/kqueue.c
  (get_kqueue_revent): Use == instead of & when testing for filter types.

* test/testpoll.c
  (multi_event_pollset): Handle the fact that we can sometimes get multiple
   events for a single socket.

* CHANGES: Note fix.


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

CHANGES

@@ -1,5 +1,9 @@
 Changes for APR 1.3.0
 
+  *) Correct bug in kqueue backend for apr_pollset where we would
+     erroneously indicate that a socket was readable or writeable.
+     [Garrett Rooney]
+
   *) Implement support for apr_proc_mutex_trylock() on Unix platforms.
      PR 38785.  [Chris Darroch <chrisd pearsoncmg.com>]
 

poll/unix/kqueue.c

@@ -22,9 +22,9 @@ static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags)
 {
     apr_int16_t rv = 0;
 
-    if (event & EVFILT_READ)
+    if (event == EVFILT_READ)
         rv |= APR_POLLIN;
-    if (event & EVFILT_WRITE)
+    if (event == EVFILT_WRITE)
         rv |= APR_POLLOUT;
     if (flags & EV_EOF)
         rv |= APR_POLLHUP;

test/testpoll.c

@@ -309,10 +309,25 @@ static void multi_event_pollset(abts_case *tc, void *data)
 
     rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
     ABTS_INT_EQUAL(tc, 0, APR_STATUS_IS_TIMEUP(rv));
-    ABTS_INT_EQUAL(tc, 1, lrv);
-    ABTS_PTR_EQUAL(tc, s[0], descs[0].desc.s);
-    ABTS_INT_EQUAL(tc, APR_POLLIN | APR_POLLOUT, descs[0].rtnevents);
-    ABTS_PTR_EQUAL(tc, s[0],  descs[0].client_data);
+    if (lrv == 1) {
+        ABTS_PTR_EQUAL(tc, s[0], descs[0].desc.s);
+        ABTS_INT_EQUAL(tc, APR_POLLIN | APR_POLLOUT, descs[0].rtnevents);
+        ABTS_PTR_EQUAL(tc, s[0],  descs[0].client_data);
+    }
+    else if (lrv == 2) {
+        ABTS_PTR_EQUAL(tc, s[0], descs[0].desc.s);
+        ABTS_PTR_EQUAL(tc, s[0], descs[0].client_data);
+        ABTS_PTR_EQUAL(tc, s[0], descs[1].desc.s);
+        ABTS_PTR_EQUAL(tc, s[0], descs[1].client_data);
+        ABTS_ASSERT(tc, "returned events incorrect",
+                    ((descs[0].rtnevents | descs[1].rtnevents)
+                     == (APR_POLLIN | APR_POLLOUT))
+                    && descs[0].rtnevents != descs[1].rtnevents);
+    }
+    else {
+        ABTS_ASSERT(tc, "either one or two events returned",
+                    lrv == 1 || lrv == 2);
+    }
 
     recv_msg(s, 0, p, tc);