From ea9b3a664f5e67d0ee6b0bf6ca362835ae11fedc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 20 Dec 2021 20:48:32 +0900 Subject: [PATCH] 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) Related: #2122499 --- src/journal-remote/journal-remote-main.c | 2 +- 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 47fe9d7433..bcaa370099 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -304,7 +304,7 @@ static int 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 26909082a1..dd0ca1d9bd 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