projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e21459
)
Reverting erroneous changes made of the course of adding a timeout to journal-remote...
author
martingh
<martinsteuer@gmx.de>
Wed, 1 Nov 2017 09:15:38 +0000
(10:15 +0100)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Wed, 1 Nov 2017 09:15:38 +0000
(10:15 +0100)
src/journal-remote/journal-remote.c
patch
|
blob
|
history
diff --git
a/src/journal-remote/journal-remote.c
b/src/journal-remote/journal-remote.c
index
c0c6cf5
..
e045e9a
100644
(file)
--- 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;
}