mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.http.Client: disable zstd for now

Browse Source 
The Allocator requirement is problematic.
This commit is contained in:
Andrew Kelley 2024-02-16 00:24:58 -07:00
parent 4d401e6159
commit b6ca89fa7c
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/std/http/Client.zig
View File

@ -407,11 +407,13 @@ pub const RequestTransfer = union(enum) {
pub const Compression = union(enum) {
pub const DeflateDecompressor = std.compress.zlib.Decompressor(Request.TransferReader);
pub const GzipDecompressor = std.compress.gzip.Decompressor(Request.TransferReader);
pub const ZstdDecompressor = std.compress.zstd.DecompressStream(Request.TransferReader, .{});
// https://github.com/ziglang/zig/issues/18937
//pub const ZstdDecompressor = std.compress.zstd.DecompressStream(Request.TransferReader, .{});
deflate: DeflateDecompressor,
gzip: GzipDecompressor,
zstd: ZstdDecompressor,
// https://github.com/ziglang/zig/issues/18937
//zstd: ZstdDecompressor,
none: void,
};
@ -641,13 +643,6 @@ pub const Request = struct {
/// Frees all resources associated with the request.
pub fn deinit(req: *Request) void {
switch (req.response.compression) {
.none => {},
.deflate => {},
.gzip => {},
.zstd => |*zstd| zstd.deinit(),
}
if (req.connection) |connection| {
if (req.response.parser.state != .complete) {
// If the response wasn't fully read, then we need to close the connection.
@ -666,13 +661,6 @@ pub const Request = struct {
fn redirect(req: *Request, uri: Uri) !void {
assert(req.response.parser.state == .complete);
switch (req.response.compression) {
.none => {},
.deflate => {},
.gzip => {},
.zstd => |*zstd| zstd.deinit(),
}
req.client.connection_pool.release(req.client.allocator, req.connection.?);
req.connection = null;
@ -764,7 +752,9 @@ pub const Request = struct {
}
if (try emitOverridableHeader("accept-encoding: ", req.headers.accept_encoding, w)) {
try w.writeAll("accept-encoding: gzip, deflate, zstd\r\n");
// https://github.com/ziglang/zig/issues/18937
//try w.writeAll("accept-encoding: gzip, deflate, zstd\r\n");
try w.writeAll("accept-encoding: gzip, deflate\r\n");
}
switch (req.transfer_encoding) {
@ -988,9 +978,11 @@ pub const Request = struct {
.gzip, .@"x-gzip" => req.response.compression = .{
.gzip = std.compress.gzip.decompressor(req.transferReader()),
},
.zstd => req.response.compression = .{
.zstd = std.compress.zstd.decompressStream(req.client.allocator, req.transferReader()),
},
// https://github.com/ziglang/zig/issues/18937
//.zstd => req.response.compression = .{
// .zstd = std.compress.zstd.decompressStream(req.client.allocator, req.transferReader()),
//},
.zstd => return error.CompressionUnsupported,
}
}
@ -1013,7 +1005,8 @@ pub const Request = struct {
const out_index = switch (req.response.compression) {
.deflate => |*deflate| deflate.read(buffer) catch return error.DecompressionFailure,
.gzip => |*gzip| gzip.read(buffer) catch return error.DecompressionFailure,
.zstd => |*zstd| zstd.read(buffer) catch return error.DecompressionFailure,
// https://github.com/ziglang/zig/issues/18937
//.zstd => |*zstd| zstd.read(buffer) catch return error.DecompressionFailure,
else => try req.transferRead(buffer),
};