From 31bbeb520db36a6e178f2f1b724d79d76d3633cf Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 18 Aug 2021 07:37:24 +0100 Subject: [PATCH] minimal: eventlib-custom: handle fds removal in service https://github.com/warmcat/libwebsockets/issues/2388 --- .../minimal-http-server.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/minimal-examples/http-server/minimal-http-server-eventlib-custom/minimal-http-server.c b/minimal-examples/http-server/minimal-http-server-eventlib-custom/minimal-http-server.c index 42b8c0585..e969fea2b 100644 --- a/minimal-examples/http-server/minimal-http-server-eventlib-custom/minimal-http-server.c +++ b/minimal-examples/http-server/minimal-http-server-eventlib-custom/minimal-http-server.c @@ -144,12 +144,19 @@ custom_poll_run(custom_poll_ctx_t *cpcx) continue; for (n = 0; n < cpcx->count_pollfds; n++) { + lws_sockfd_type fd = cpcx->pollfds[n].fd; int m; if (!cpcx->pollfds[n].revents) continue; m = lws_service_fd(context, &cpcx->pollfds[n]); + + /* if something closed, retry this slot since may have been + * swapped with end fd */ + if (m && cpcx->pollfds[n].fd != fd) + n--; + if (m < 0) /* lws feels something bad happened, but * the outer application may not care */