Merge branch 'Z3' of https://github.com/skysql/MaxScale into Z3

poll.c:poll_add_dcb: Addded EPOLLHUP back to flag set.
2014-09-04 12:29:06 +03:00
parent 7fcf950f8f 5e529a8296
commit 0630b2ff46
14 changed files with 162 additions and 56 deletions
--- a/server/core/poll.c
+++ b/server/core/poll.c
@ -100,7 +100,7 @@ poll_add_dcb(DCB *dcb)

        CHK_DCB(dcb);
        
-	ev.events = EPOLLIN | EPOLLOUT | EPOLLET;
+	ev.events = EPOLLIN | EPOLLOUT | EPOLLET | EPOLLHUP;
 	ev.data.ptr = dcb;

        /*<
@ -480,7 +480,7 @@ poll_waitevents(void *arg)
 			} /*< for */
                        no_op = FALSE;
 		}
-        process_zombies:
+process_zombies:
 		zombies = dcb_process_zombies(thread_id);
                
                if (zombies == NULL) {