diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-03-02 20:58:07 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-03-02 21:45:26 +0100 |
commit | 73532f78bb3a1a07c091ef7123b3ab49347c0b95 (patch) | |
tree | 6aa9213746106b980ff3848e64965422f449265c /src/microhttpd/daemon.c | |
parent | 71a67ca95997fb2c3a90108a776f61fe1b95e68c (diff) | |
download | libmicrohttpd-73532f78bb3a1a07c091ef7123b3ab49347c0b95.tar.gz libmicrohttpd-73532f78bb3a1a07c091ef7123b3ab49347c0b95.zip |
minimal logic simplifications
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 24fbe082..8c196421 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -3350,8 +3350,10 @@ MHD_run_from_select (struct MHD_Daemon *daemon, | |||
3350 | if (0 != (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME)) | 3350 | if (0 != (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME)) |
3351 | resume_suspended_connections (daemon); | 3351 | resume_suspended_connections (daemon); |
3352 | 3352 | ||
3353 | return internal_run_from_select (daemon, read_fd_set, | 3353 | return internal_run_from_select (daemon, |
3354 | write_fd_set, except_fd_set); | 3354 | read_fd_set, |
3355 | write_fd_set, | ||
3356 | except_fd_set); | ||
3355 | } | 3357 | } |
3356 | 3358 | ||
3357 | 3359 | ||
@@ -6339,7 +6341,8 @@ MHD_stop_daemon (struct MHD_Daemon *daemon) | |||
6339 | /* Separate thread(s) is used for polling sockets. */ | 6341 | /* Separate thread(s) is used for polling sockets. */ |
6340 | if (MHD_ITC_IS_VALID_(daemon->itc)) | 6342 | if (MHD_ITC_IS_VALID_(daemon->itc)) |
6341 | { | 6343 | { |
6342 | if (! MHD_itc_activate_ (daemon->itc, "e")) | 6344 | if (! MHD_itc_activate_ (daemon->itc, |
6345 | "e")) | ||
6343 | MHD_PANIC (_("Failed to signal shutdown via inter-thread communication channel")); | 6346 | MHD_PANIC (_("Failed to signal shutdown via inter-thread communication channel")); |
6344 | } | 6347 | } |
6345 | else | 6348 | else |