svn commit: rev 65573 - in apr/apr/trunk: . poll/unix

[pq...@apache.org]

Author: pquerna
Date: Sat Nov 13 18:35:00 2004
New Revision: 65573

Modified:
   apr/apr/trunk/CHANGES
   apr/apr/trunk/poll/unix/poll.c
Log:
Fix KQueue for Pollset.
Now you don't get an Error when you should of gotten a HUP.


Modified: apr/apr/trunk/CHANGES
==============================================================================
--- apr/apr/trunk/CHANGES	(original)
+++ apr/apr/trunk/CHANGES	Sat Nov 13 18:35:00 2004
@@ -1,5 +1,8 @@
 Changes for APR 1.1 [Deferring these features when 1.0 is rolled out.]
 
+  *) Fix HUP return codes in pollset when using KQueue.
+     [Paul Querna]
+
   *) Prevent unbounded memory use during repeated operations on a hash table.
      [Julian Foad <julianfoad btopenworld.com>
 

Modified: apr/apr/trunk/poll/unix/poll.c
==============================================================================
--- apr/apr/trunk/poll/unix/poll.c	(original)
+++ apr/apr/trunk/poll/unix/poll.c	Sat Nov 13 18:35:00 2004
@@ -50,7 +50,9 @@
         rv |= APR_POLLIN;
     if (event & EVFILT_WRITE)
         rv |= APR_POLLOUT;
-    if (flags & EV_ERROR || flags & EV_EOF)
+    if (flags & EV_EOF)
+        rv |= APR_POLLHUP;
+    if (flags & EV_ERROR)
         rv |= APR_POLLERR;
 
     return rv;