diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2017-02-01 10:02:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-01 10:02:50 +0100 |
| commit | b5267219ddd327207128b3e311f29eac232c6dde (patch) | |
| tree | 1672e02ca6d0caa73ffb0e73b998bda6e106726d /src/journal-remote/journal-gatewayd.c | |
| parent | Merge pull request #5146 from ssahani/ifname-alias (diff) | |
| parent | nss-util: silence warning about deprecated RES_USE_INET6 (diff) | |
| download | systemd-b5267219ddd327207128b3e311f29eac232c6dde.tar.xz systemd-b5267219ddd327207128b3e311f29eac232c6dde.zip | |
Merge pull request #5166 from keszybz/gcc7
Fixes for gcc 7 and new µhttpd & glibc warnings
Diffstat (limited to 'src/journal-remote/journal-gatewayd.c')
| -rw-r--r-- | src/journal-remote/journal-gatewayd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index f86b67faa2..9a1c5b76ca 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -1029,10 +1029,9 @@ int main(int argc, char *argv[]) { { MHD_OPTION_END, 0, NULL }}; int opts_pos = 2; - /* We force MHD_USE_PIPE_FOR_SHUTDOWN here, in order - * to make sure libmicrohttpd doesn't use shutdown() - * on our listening socket, which would break socket - * re-activation. See + /* We force MHD_USE_ITC here, in order to make sure + * libmicrohttpd doesn't use shutdown() on our listening + * socket, which would break socket re-activation. See * * https://lists.gnu.org/archive/html/libmicrohttpd/2015-09/msg00014.html * https://github.com/systemd/systemd/pull/1286 @@ -1041,7 +1040,7 @@ int main(int argc, char *argv[]) { int flags = MHD_USE_DEBUG | MHD_USE_DUAL_STACK | - MHD_USE_PIPE_FOR_SHUTDOWN | + MHD_USE_ITC | MHD_USE_POLL | MHD_USE_THREAD_PER_CONNECTION; |