From c272c06b9edbb3c876c5e124a7b2a40c58c9efb1 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 11 Feb 2025 16:42:59 +0900 Subject: [PATCH] journal-remote: assume received data is not compressed when Content-Encoding header is not set Also, refuse spurious header `Content-Encoding: none`. --- src/journal-remote/journal-remote-main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 3579b507ef..97b040af32 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -322,11 +322,13 @@ static mhd_result request_handler( header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Content-Encoding"); if (header) { Compression c = compression_lowercase_from_string(header); - if (c < 0 || !compression_supported(c)) + if (c <= 0 || !compression_supported(c)) return mhd_respondf(connection, 0, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE, "Unsupported Content-Encoding type: %s", header); source->compression = c; - } + } else + source->compression = COMPRESSION_NONE; + return process_http_upload(connection, upload_data, upload_data_size, source);