diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-01 09:53:15 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-01 09:53:15 +0200 |
| commit | 2ce8d6080d4135ae8926fc783766c3dfbeb7a6b0 (patch) | |
| tree | 6ffd2519d5623fa971709a856540daa2bf6dbe3e /src/journal-remote/journal-remote.c | |
| parent | e4c46dcede2cf41ebd0910dfb0788b23f1f6da45 (diff) | |
| parent | ef08ced6b44d4f56477a6798e56ba5c5c9e0023f (diff) | |
Merge pull request #1429 from poettering/dhcp-hostname
DHCP and journal remoting fix, as well as NEWS update
Diffstat (limited to 'src/journal-remote/journal-remote.c')
| -rw-r--r-- | src/journal-remote/journal-remote.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 50f41a575d..5354bf6e51 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -647,9 +647,10 @@ static int setup_microhttpd_server(RemoteServer *s, int opts_pos = 3; int flags = MHD_USE_DEBUG | - MHD_USE_PEDANTIC_CHECKS | + MHD_USE_DUAL_STACK | MHD_USE_EPOLL_LINUX_ONLY | - MHD_USE_DUAL_STACK; + MHD_USE_PEDANTIC_CHECKS | + MHD_USE_PIPE_FOR_SHUTDOWN; const union MHD_DaemonInfo *info; int r, epoll_fd; |