X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/e074416be49947c7bab5e237fab7210441bd99e5..a1b1c1ea3adb864c8c2e3feb4eaed890a9b505cf:/src/ae_epoll.c

diff --git a/src/ae_epoll.c b/src/ae_epoll.c
index fc6d9ccd..0231f243 100644
--- a/src/ae_epoll.c
+++ b/src/ae_epoll.c
@@ -13,7 +13,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
     aeApiState *state = zmalloc(sizeof(aeApiState));
 
     if (!state) return -1;
-    state->events = zmalloc(sizeof(epoll_event)*eventLoop->setsize);
+    state->events = zmalloc(sizeof(struct epoll_event)*eventLoop->setsize);
     if (!state->events) {
         zfree(state);
         return -1;
@@ -89,6 +89,8 @@ static int aeApiPoll(aeEventLoop *eventLoop, struct timeval *tvp) {
 
             if (e->events & EPOLLIN) mask |= AE_READABLE;
             if (e->events & EPOLLOUT) mask |= AE_WRITABLE;
+            if (e->events & EPOLLERR) mask |= AE_WRITABLE;
+            if (e->events & EPOLLHUP) mask |= AE_WRITABLE;
             eventLoop->fired[j].fd = e->data.fd;
             eventLoop->fired[j].mask = mask;
         }