|
 |
04e329 |
From ea9b3a664f5e67d0ee6b0bf6ca362835ae11fedc Mon Sep 17 00:00:00 2001
|
|
|
04e329 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
04e329 |
Date: Mon, 20 Dec 2021 20:48:32 +0900
|
|
|
04e329 |
Subject: [PATCH] journal-remote: use MHD_HTTP_CONTENT_TOO_LARGE as
|
|
|
04e329 |
MHD_HTTP_PAYLOAD_TOO_LARGE is deprecated since 0.9.74
|
|
|
04e329 |
|
|
|
04e329 |
(cherry picked from commit 30df858f43b14a55c6650b43bea12cbf2cc0bc67)
|
|
|
04e329 |
|
|
|
04e329 |
Related: #2122499
|
|
|
04e329 |
---
|
|
|
04e329 |
src/journal-remote/journal-remote-main.c | 2 +-
|
|
|
04e329 |
src/journal-remote/microhttpd-util.h | 10 +++++++---
|
|
|
04e329 |
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
04e329 |
|
|
|
04e329 |
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
|
|
|
04e329 |
index 47fe9d7433..bcaa370099 100644
|
|
|
04e329 |
--- a/src/journal-remote/journal-remote-main.c
|
|
|
04e329 |
+++ b/src/journal-remote/journal-remote-main.c
|
|
|
04e329 |
@@ -304,7 +304,7 @@ static int request_handler(
|
|
|
04e329 |
/* When serialized, an entry of maximum size might be slightly larger,
|
|
|
04e329 |
* so this does not correspond exactly to the limit in journald. Oh well.
|
|
|
04e329 |
*/
|
|
|
04e329 |
- return mhd_respondf(connection, 0, MHD_HTTP_PAYLOAD_TOO_LARGE,
|
|
|
04e329 |
+ return mhd_respondf(connection, 0, MHD_HTTP_CONTENT_TOO_LARGE,
|
|
|
04e329 |
"Payload larger than maximum size of %u bytes", ENTRY_SIZE_MAX);
|
|
|
04e329 |
}
|
|
|
04e329 |
|
|
|
04e329 |
diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
|
|
|
04e329 |
index 26909082a1..dd0ca1d9bd 100644
|
|
|
04e329 |
--- a/src/journal-remote/microhttpd-util.h
|
|
|
04e329 |
+++ b/src/journal-remote/microhttpd-util.h
|
|
|
04e329 |
@@ -38,9 +38,13 @@
|
|
|
04e329 |
# define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE
|
|
|
04e329 |
#endif
|
|
|
04e329 |
|
|
|
04e329 |
-/* Renamed in µhttpd 0.9.53 */
|
|
|
04e329 |
-#ifndef MHD_HTTP_PAYLOAD_TOO_LARGE
|
|
|
04e329 |
-# define MHD_HTTP_PAYLOAD_TOO_LARGE MHD_HTTP_REQUEST_ENTITY_TOO_LARGE
|
|
|
04e329 |
+/* Renamed in µhttpd 0.9.74 (8c644fc1f4d498ea489add8d40a68f5d3e5899fa) */
|
|
|
04e329 |
+#ifndef MHD_HTTP_CONTENT_TOO_LARGE
|
|
|
04e329 |
+# ifdef MHD_HTTP_PAYLOAD_TOO_LARGE
|
|
|
04e329 |
+# define MHD_HTTP_CONTENT_TOO_LARGE MHD_HTTP_PAYLOAD_TOO_LARGE /* 0.9.53 or newer */
|
|
|
04e329 |
+# else
|
|
|
04e329 |
+# define MHD_HTTP_CONTENT_TOO_LARGE MHD_HTTP_REQUEST_ENTITY_TOO_LARGE
|
|
|
04e329 |
+# endif
|
|
|
04e329 |
#endif
|
|
|
04e329 |
|
|
|
04e329 |
#if MHD_VERSION < 0x00094203
|