From 723afa4f964aa3c7122cd218f631f692c08aa23f Mon Sep 17 00:00:00 2001 From: martingh Date: Wed, 1 Nov 2017 10:15:38 +0100 Subject: [PATCH] Reverting erroneous changes made of the course of adding a timeout to journal-remote event handling (#7219) --- src/journal-remote/journal-remote.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index c0c6cf5..e045e9a 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -807,19 +807,13 @@ static int dispatch_http_event(sd_event_source *event, void *userdata) { MHDDaemonWrapper *d = userdata; int r; - fd_set rd, w, e; MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX; assert(d); - r = MHD_get_fdset(d->daemon, &rd, &w, &e, 0); + r = MHD_run(d->daemon); if (r == MHD_NO) { - log_error("MHD_get_fdset failed!"); - return -EINVAL; - } - r = MHD_run_from_select(d->daemon, &rd, &w, &e); - if (r == MHD_NO) { - log_error("MHD_run_from_select failed!"); + log_error("MHD_run failed!"); // XXX: unregister daemon return -EINVAL; } -- 2.7.4