mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-05 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

git fetching: fix redirect handling

Browse Source 
I mistakenly thought this was dead code in an earlier commit in this
branch. This commit restores the proper behavior.
This commit is contained in:
Andrew Kelley 2024-02-16 00:56:13 -07:00
parent b6ca89fa7c
commit 99a5de9dbb
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -639,6 +639,11 @@ pub const Request = struct {
_ => rb.* = @enumFromInt(@intFromEnum(rb.*) - 1),
}
}
pub fn remaining(rb: RedirectBehavior) u16 {
assert(rb != .unhandled);
return @intFromEnum(rb);
}
};
/// Frees all resources associated with the request.

11
src/Package/Fetch/git.zig
View File

@ -530,8 +530,9 @@ pub const Session = struct {
info_refs_uri.query = "service=git-upload-pack";
info_refs_uri.fragment = null;
const max_redirects = 3;
var request = try session.transport.open(.GET, info_refs_uri, .{
.redirect_behavior = @enumFromInt(3),
.redirect_behavior = @enumFromInt(max_redirects),
.server_header_buffer = http_headers_buffer,
.extra_headers = &.{
.{ .name = "Git-Protocol", .value = "version=2" },
@ -543,12 +544,8 @@ pub const Session = struct {
try request.wait();
if (request.response.status != .ok) return error.ProtocolError;
// Pretty sure this is dead code - in order for a redirect to occur, the status
// code would need to be in the 300s and then it would not be "OK" which is checked
// on the line above.
var runtime_false = false;
_ = &runtime_false;
if (runtime_false) {
const any_redirects_occurred = request.redirect_behavior.remaining() < max_redirects;
if (any_redirects_occurred) {
if (!mem.endsWith(u8, request.uri.path, "/info/refs")) return error.UnparseableRedirect;
var new_uri = request.uri;
new_uri.path = new_uri.path[0 .. new_uri.path.len - "/info/refs".len];