summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-30 15:48:49 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-30 15:48:49 +0100
commited574a6834d267c82cac0408fe977c26256bec9a (patch)
treea8be132bbfaea42d9d7e15bc539a82625f472e2e
parentMerge pull request #1720 from evverx/shell-completion-global-mode (diff)
parentjournal-remote: increase memory limit per connection to avoid errors with HTTPS (diff)
downloadsystemd-ed574a6834d267c82cac0408fe977c26256bec9a.tar.xz
systemd-ed574a6834d267c82cac0408fe977c26256bec9a.zip
Merge pull request #1729 from endocode/dongsu/jr-mhd-memlimit-v3
journal-remote: increase memory limit per connection to avoid errors …
Diffstat (limited to '')
-rw-r--r--src/journal-remote/journal-remote.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 44550532b6..20be542096 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -648,11 +648,12 @@ static int setup_microhttpd_server(RemoteServer *s,
{ MHD_OPTION_NOTIFY_COMPLETED, (intptr_t) request_meta_free},
{ MHD_OPTION_EXTERNAL_LOGGER, (intptr_t) microhttpd_logger},
{ MHD_OPTION_LISTEN_SOCKET, fd},
+ { MHD_OPTION_CONNECTION_MEMORY_LIMIT, DATA_SIZE_MAX},
{ MHD_OPTION_END},
{ MHD_OPTION_END},
{ MHD_OPTION_END},
{ MHD_OPTION_END}};
- int opts_pos = 3;
+ int opts_pos = 4;
int flags =
MHD_USE_DEBUG |
MHD_USE_DUAL_STACK |