mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-24 18:50:49 +00:00
resolved conflict, added new compression method in http
This commit is contained in:
parent
98ee8e8d5e
commit
08b8eb8fc2
@ -353,6 +353,8 @@ void HTTPHandler::processQuery(
|
|||||||
http_response_compression_method = CompressionMethod::Zlib;
|
http_response_compression_method = CompressionMethod::Zlib;
|
||||||
else if (std::string::npos != http_response_compression_methods.find("xz"))
|
else if (std::string::npos != http_response_compression_methods.find("xz"))
|
||||||
http_response_compression_method = CompressionMethod::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;
|
bool client_supports_http_compression = http_response_compression_method != CompressionMethod::None;
|
||||||
|
Loading…
Reference in New Issue
Block a user