]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Reverting erroneous changes made of the course of adding a timeout to journal-remote...
authormartingh <martinsteuer@gmx.de>
Wed, 1 Nov 2017 09:15:38 +0000 (10:15 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 1 Nov 2017 09:15:38 +0000 (10:15 +0100)
src/journal-remote/journal-remote.c

index c0c6cf5f9667085eb8944195ed1eaf9411834cbb..e045e9a8424d4657ca3ef3d9fa4fd0dd03fc3feb 100644 (file)
@@ -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;
         }