1 files changed, 6 insertions, 1 deletions

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 5d99fa40..b8bb7b3d 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1591,7 +1591,12 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
                         pos->addr_len);
 #if EPOLL_SUPPORT
       if (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL))
-        MHD_PANIC ("Internal error");
+        {
+          EDLL_remove (daemon->eready_head,
+                       daemon->eready_tail,
+                       pos);
+          pos->epoll_state &= ~MHD_EPOLL_STATE_IN_EREADY_EDLL;
+        }
       if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) &&
            (-1 != daemon->epoll_fd) &&
            (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) )