diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-09-02 14:45:28 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-09-02 14:45:28 +0000 |
| commit | 9e87c9a225ddcb3092fd3cd9ec428801edac69b4 (patch) | |
| tree | ecb9f9f735befd4606ce8ba787eedbe2de308687 /src/microhttpd/daemon.c | |
| parent | 475b350b710463111893bf4b9deb3c8e5a1c62cc (diff) | |
| download | libmicrohttpd-9e87c9a225ddcb3092fd3cd9ec428801edac69b4.tar.gz libmicrohttpd-9e87c9a225ddcb3092fd3cd9ec428801edac69b4.zip | |
patch from FC to fix use of resume in combination with external select
Diffstat (limited to 'src/microhttpd/daemon.c')
| -rw-r--r-- | src/microhttpd/daemon.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 428b86df..40ce74b3 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
| @@ -2220,6 +2220,12 @@ MHD_run_from_select (struct MHD_Daemon *daemon, | |||
| 2220 | char tmp; | 2220 | char tmp; |
| 2221 | struct MHD_Connection *pos; | 2221 | struct MHD_Connection *pos; |
| 2222 | struct MHD_Connection *next; | 2222 | struct MHD_Connection *next; |
| 2223 | unsigned int mask = MHD_USE_SUSPEND_RESUME | MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY | | ||
| 2224 | MHD_USE_SELECT_INTERNALLY | MHD_USE_POLL_INTERNALLY | MHD_USE_THREAD_PER_CONNECTION; | ||
| 2225 | |||
| 2226 | /* Resuming external connections when using an extern mainloop */ | ||
| 2227 | if (MHD_USE_SUSPEND_RESUME == (daemon->options & mask)) | ||
| 2228 | resume_suspended_connections (daemon); | ||
| 2223 | 2229 | ||
| 2224 | #if EPOLL_SUPPORT | 2230 | #if EPOLL_SUPPORT |
| 2225 | if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) | 2231 | if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) |