diff options
| author | Christian Grothoff <christian@grothoff.org> | 2019-07-29 20:03:41 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2019-07-29 20:03:41 +0200 |
| commit | bafd078984be5f846287107824eca99e6c6c42cc (patch) | |
| tree | 5fb769de723645f08651a4161dfff261f28effe8 /src/microhttpd | |
| parent | 9c15b24f596dfd7374d8909a254ec2df76366300 (diff) | |
| download | libmicrohttpd-bafd078984be5f846287107824eca99e6c6c42cc.tar.gz libmicrohttpd-bafd078984be5f846287107824eca99e6c6c42cc.zip | |
fix hang reported by Viet on 24.6.2019 on the mailinglist: do not just consider nested epoll, but also already ready connections
Diffstat (limited to 'src/microhttpd')
| -rw-r--r-- | src/microhttpd/daemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 7ce0fbb3..bf01ba9b 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
| @@ -4519,7 +4519,7 @@ MHD_epoll (struct MHD_Daemon *daemon, | |||
| 4519 | } | 4519 | } |
| 4520 | 4520 | ||
| 4521 | #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT) | 4521 | #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT) |
| 4522 | if (run_upgraded) | 4522 | if (run_upgraded || (NULL != daemon->eready_urh_head)) |
| 4523 | run_epoll_for_upgrade (daemon); | 4523 | run_epoll_for_upgrade (daemon); |
| 4524 | #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */ | 4524 | #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */ |
| 4525 | 4525 | ||