mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.http: fix parsing incorrect tokenization

Browse Source
This commit is contained in:
Andrew Kelley 2024-02-16 19:15:17 -07:00
parent ae630b695e
commit ddb754ff2f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,6 +545,7 @@ pub const Response = struct {
}
}
}
return error.HttpHeadersInvalid; // missing empty line
}
inline fn int64(array: *const [8]u8) u64 {

12
lib/std/http/Server.zig
View File

@ -197,9 +197,9 @@ pub const Request = struct {
};
pub fn parse(req: *Request, bytes: []const u8) ParseError!void {
var it = mem.tokenizeAny(u8, bytes, "\r\n");
var it = mem.splitSequence(u8, bytes, "\r\n");
const first_line = it.next() orelse return error.HttpHeadersInvalid;
const first_line = it.next().?;
if (first_line.len < 10)
return error.HttpHeadersInvalid;
@ -229,15 +229,16 @@ pub const Request = struct {
req.version = version;
while (it.next()) |line| {
if (line.len == 0) return error.HttpHeadersInvalid;
if (line.len == 0) return;
switch (line[0]) {
' ', '\t' => return error.HttpHeaderContinuationsUnsupported,
else => {},
}
var line_it = mem.tokenizeAny(u8, line, ": ");
const header_name = line_it.next() orelse return error.HttpHeadersInvalid;
var line_it = mem.splitSequence(u8, line, ": ");
const header_name = line_it.next().?;
const header_value = line_it.rest();
if (header_value.len == 0) return error.HttpHeadersInvalid;
if (std.ascii.eqlIgnoreCase(header_name, "connection")) {
req.keep_alive = !std.ascii.eqlIgnoreCase(header_value, "close");
@ -291,6 +292,7 @@ pub const Request = struct {
if (iter.next()) |_| return error.HttpTransferEncodingUnsupported;
}
}
return error.HttpHeadersInvalid; // missing empty line
}
inline fn int64(array: *const [8]u8) u64 {