commit 9e1fff5f7998fcb171c958c10a84d72b4df7eb93
author Cliff Jansen <cliffjansen@apache.org> Thu May 07 07:33:16 2020 -0700
committer Cliff Jansen <cliffjansen@apache.org> Thu May 07 07:33:16 2020 -0700
tree bd2a8251921444eb675699fa76a8bf11bf33aabf
parent 6b0b440d23e6373a4d5af80986e5710eaed47937

PROTON-2211: fix fd leak on connections in new epoll proactor implementation

c/src/proactor/epoll.c

diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index 6667365..6ae9660 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -953,7 +953,11 @@
   stop_polling(&pc->psocket.epoll_io, pc->psocket.proactor->epollfd);
   if (fd != -1)
     pclosefd(pc->psocket.proactor, fd);
+
+  fd = pc->timer.epoll_io.fd;
   stop_polling(&pc->timer.epoll_io, pc->psocket.proactor->epollfd);
+  if (fd != -1)
+    pclosefd(pc->psocket.proactor, fd);
   ptimer_finalize(&pc->timer);
 
   lock(&pc->context.mutex);