zig

commit 54d1a529f652cf79bf9edc95463380c5c853e4db (tree)
parent 7cc0e6d4cd5d699d5377cf47ee27a2e089d046bf
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Sat, 13 Apr 2024 03:39:35 -0700

Merge pull request #19637 from ziglang/http-host-port

std.http.Client: omit port in http host header sometimes
Diffstat:
M
lib/std/Uri.zig
 | 
7
++++++-
M
lib/std/http/Client.zig
 | 
13
++++++++-----

2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/lib/std/Uri.zig b/lib/std/Uri.zig
@@ -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(
@@ -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) {
diff --git a/lib/std/http/Client.zig b/lib/std/http/Client.zig
@@ -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();
 
@@ -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;
@@ -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.
@@ -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,