*** empty log message ***

diff --git a/Changes b/Changes
index ed3f2b09905543e6b57da215f41fd3cc3d28be18..20e7bd64edd6409430652d3502528362ee4547b0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -15,6 +15,8 @@ TODO: document portbaility requirements for atomic pointer access
 TODO: possible cb aliasing?
 TODO: document requirements for function piinters and calling conventions.
 
+       - events on files were not always generated properly with the
+          epoll backend (testcase by Assaf Inbal).
        - mark event pipe fd as cloexec after a fork (analyzed by Sami Farin).
         - (ecb) support m68k, m88k and sh (patch by Miod Vallat).
         - use a reasonable fallback for EV_NSIG instead of erroring out

diff --git a/ev_epoll.c b/ev_epoll.c
index f5ad6188050563371eb7d6ae8bbaff6f45c2d619..7472b60e03050d418e36caf3b7849b7680c8d0c6 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -228,7 +228,10 @@ epoll_poll (EV_P_ ev_tstamp timeout)
       if (anfds [fd].emask & EV_EMASK_EPERM && events)
         fd_event (EV_A_ fd, events);
       else
-        epoll_eperms [i] = epoll_eperms [--epoll_epermcnt];
+        {
+          epoll_eperms [i] = epoll_eperms [--epoll_epermcnt];
+          anfds [fd].emask = 0;
+        }
     }
 }