Skip to content

Remove unecessary content type parse #945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2025
Merged

Remove unecessary content type parse #945

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2f15ce
Remove unecessary content type parse
karlseguin Aug 14, 2025
5b2806a
expose response header amount
karlseguin Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions src/http/Client.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,20 +641,6 @@ pub const Transfer = struct {
return buf_len;
}

var hdr = &transfer.response_header.?;

if (hdr._content_type_len == 0) {
const CONTENT_TYPE_LEN = "content-type:".len;
if (header.len > CONTENT_TYPE_LEN) {
if (std.ascii.eqlIgnoreCase(header[0..CONTENT_TYPE_LEN], "content-type:")) {
const value = std.mem.trimLeft(u8, header[CONTENT_TYPE_LEN..], " ");
const len = @min(value.len, hdr._content_type.len);
hdr._content_type_len = len;
@memcpy(hdr._content_type[0..len], value[0..len]);
}
}
}

{
const SET_COOKIE_LEN = "set-cookie:".len;
if (header.len > SET_COOKIE_LEN) {
Expand All @@ -668,7 +654,9 @@ pub const Transfer = struct {
}

if (buf_len == 2) {
if (getResponseHeader(easy, "content-type")) |value| {
if (getResponseHeader(easy, "content-type", 0)) |ct| {
var hdr = &transfer.response_header.?;
const value = ct.value;
const len = @min(value.len, hdr._content_type.len);
hdr._content_type_len = len;
@memcpy(hdr._content_type[0..len], value[0..len]);
Expand Down Expand Up @@ -761,11 +749,19 @@ const HeaderIterator = struct {
}
};

fn getResponseHeader(easy: *c.CURL, name: [:0]const u8) ?[]const u8 {
const ResponseHeader = struct {
value: []const u8,
amount: usize,
};

fn getResponseHeader(easy: *c.CURL, name: [:0]const u8, index: usize) ?ResponseHeader {
var hdr: [*c]c.curl_header = null;
const result = c.curl_easy_header(easy, name, 0, c.CURLH_HEADER, -1, &hdr);
const result = c.curl_easy_header(easy, name, index, c.CURLH_HEADER, -1, &hdr);
if (result == c.CURLE_OK) {
return std.mem.span(hdr.*.value);
return .{
.amount = hdr.*.amount,
.value = std.mem.span(hdr.*.value),
};
}

if (result == c.CURLE_FAILED_INIT) {
Expand Down