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> | 2022-01-11 19:41:09 +0100 |
| commit | c4d12459c6bc065bd255c9f5555ca20bf735e16a (patch) | |
| tree | 4b576b45c94a9cd8278067ff6150f7ac420afc0d | |
| parent | 4d084c7145b7f49917c44ef47ee7d90ea4d3e775 (diff) | |
| download | systemd-c4d12459c6bc065bd255c9f5555ca20bf735e16a.tar.gz | |
journal-remote: use MHD_HTTP_CONTENT_TOO_LARGE as MHD_HTTP_PAYLOAD_TOO_LARGE is deprecated since 0.9.74
(cherry picked from commit 30df858f43b14a55c6650b43bea12cbf2cc0bc67)
| -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 ae1d43756a..9ff31763da 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 |