From 08b8eb8fc244ccbfc06fdf53bd3c2d94a43a5b62 Mon Sep 17 00:00:00 2001 From: "a.palagashvili" Date: Sun, 29 Nov 2020 15:59:56 +0300 Subject: [PATCH] resolved conflict, added new compression method in http --- src/Server/HTTPHandler.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp index e7cdcd62bfb..34d510e4cb2 100644 --- a/src/Server/HTTPHandler.cpp +++ b/src/Server/HTTPHandler.cpp @@ -353,6 +353,8 @@ void HTTPHandler::processQuery( http_response_compression_method = CompressionMethod::Zlib; else if (std::string::npos != http_response_compression_methods.find("xz")) http_response_compression_method = CompressionMethod::Xz; + else if (std::string::npos != http_response_compression_methods.find("zstd")) + http_response_compression_method = CompressionMethod::Zstd; } bool client_supports_http_compression = http_response_compression_method != CompressionMethod::None;