diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-20 20:48:32 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-12-20 14:30:24 +0100 |
| commit | 30df858f43b14a55c6650b43bea12cbf2cc0bc67 (patch) | |
| tree | 05d9872c9dc885aaae60e4f17a8e30e3f993ea27 /src/journal-remote | |
| parent | 077c5cf66936f830ae8af818a93097b3cbcfa56a (diff) | |
| download | systemd-30df858f43b14a55c6650b43bea12cbf2cc0bc67.tar.gz | |
journal-remote: use MHD_HTTP_CONTENT_TOO_LARGE as MHD_HTTP_PAYLOAD_TOO_LARGE is deprecated since 0.9.74
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-remote-main.c | 2 | ||||
| -rw-r--r-- | src/journal-remote/microhttpd-util.h | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 67f1267d0a..6ab91263b1 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -319,7 +319,7 @@ static mhd_result request_handler( /* When serialized, an entry of maximum size might be slightly larger, * so this does not correspond exactly to the limit in journald. Oh well. */ - return mhd_respondf(connection, 0, MHD_HTTP_PAYLOAD_TOO_LARGE, + return mhd_respondf(connection, 0, MHD_HTTP_CONTENT_TOO_LARGE, "Payload larger than maximum size of %u bytes", ENTRY_SIZE_MAX); } diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h index a92ba57d0f..7e7d1b56b1 100644 --- a/src/journal-remote/microhttpd-util.h +++ b/src/journal-remote/microhttpd-util.h @@ -38,9 +38,13 @@ # define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE #endif -/* Renamed in µhttpd 0.9.53 */ -#ifndef MHD_HTTP_PAYLOAD_TOO_LARGE -# define MHD_HTTP_PAYLOAD_TOO_LARGE MHD_HTTP_REQUEST_ENTITY_TOO_LARGE +/* Renamed in µhttpd 0.9.74 (8c644fc1f4d498ea489add8d40a68f5d3e5899fa) */ +#ifndef MHD_HTTP_CONTENT_TOO_LARGE +# ifdef MHD_HTTP_PAYLOAD_TOO_LARGE +# define MHD_HTTP_CONTENT_TOO_LARGE MHD_HTTP_PAYLOAD_TOO_LARGE /* 0.9.53 or newer */ +# else +# define MHD_HTTP_CONTENT_TOO_LARGE MHD_HTTP_REQUEST_ENTITY_TOO_LARGE +# endif #endif #if MHD_VERSION < 0x00094203 |