Skip to content

std.http.Client: omit port in http host header sometimes #19637

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
andrewrk merged 3 commits into from
Apr 13, 2024
Merged

std.http.Client: omit port in http host header sometimes #19637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
419753f
std.http.Client: pass port to server based on user input
andrewrk Apr 12, 2024
6deb3e3
std.http.Client: always omit port when it matches default
andrewrk Apr 12, 2024
0a3dff8
Revert "std.http.Client: always omit port when it matches default"
andrewrk Apr 13, 2024
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
7 changes: 6 additions & 1 deletion lib/std/Uri.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@ pub const WriteToStreamOptions = struct {

/// When true, include the fragment part of the URI. Ignored when `path` is false.
fragment: bool = false,

/// When true, include the port part of the URI. Ignored when `port` is null.
port: bool = true,
};

pub fn writeToStream(
Expand All @@ -267,7 +270,9 @@ pub fn writeToStream(
}
if (uri.host) |host| {
try writer.print("{host}", .{host});
if (uri.port) |port| try writer.print(":{d}", .{port});
if (options.port) {
if (uri.port) |port| try writer.print(":{d}", .{port});
}
}
}
if (options.path) {
Expand Down
13 changes: 8 additions & 5 deletions lib/std/http/Client.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ pub const Request = struct {
}

req.uri = valid_uri;
req.connection = try req.client.connect(new_host, valid_uri.port.?, protocol);
req.connection = try req.client.connect(new_host, uriPort(valid_uri, protocol), protocol);
req.redirect_behavior.subtractOne();
req.response.parser.reset();

Expand Down Expand Up @@ -1264,7 +1264,7 @@ fn createProxyFromEnvVar(arena: Allocator, env_var_names: []const []const u8) !?
.protocol = protocol,
.host = valid_uri.host.?.raw,
.authorization = authorization,
.port = valid_uri.port.?,
.port = uriPort(valid_uri, protocol),
.supports_connect = true,
};
return proxy;
Expand Down Expand Up @@ -1582,11 +1582,14 @@ fn validateUri(uri: Uri, arena: Allocator) !struct { Connection.Protocol, Uri }
valid_uri.host = .{
.raw = try (uri.host orelse return error.UriMissingHost).toRawMaybeAlloc(arena),
};
valid_uri.port = uri.port orelse switch (protocol) {
return .{ protocol, valid_uri };
}

fn uriPort(uri: Uri, protocol: Connection.Protocol) u16 {
return uri.port orelse switch (protocol) {
.plain => 80,
.tls => 443,
};
return .{ protocol, valid_uri };
}

/// Open a connection to the host specified by `uri` and prepare to send a HTTP request.
Expand Down Expand Up @@ -1634,7 +1637,7 @@ pub fn open(
}

const conn = options.connection orelse
try client.connect(valid_uri.host.?.raw, valid_uri.port.?, protocol);
try client.connect(valid_uri.host.?.raw, uriPort(valid_uri, protocol), protocol);

var req: Request = .{
.uri = valid_uri,
Expand Down