Skip to content

Commit

Permalink
std.http: fix leaked connections (#16341)
Browse files Browse the repository at this point in the history
The early return in pool release was causing leaked connections.
Closes #16282.
  • Loading branch information
truemedian committed Jul 7, 2023
1 parent 80404cc commit b9fc0d2
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
7 changes: 3 additions & 4 deletions lib/std/http/Client.zig
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,15 @@ pub const ConnectionPool = struct {

if (node.data.closing) {
node.data.deinit(client);

return client.allocator.destroy(node);
}

if (pool.free_len + 1 >= pool.free_size) {
if (pool.free_len >= pool.free_size) {
const popped = pool.free.popFirst() orelse unreachable;
pool.free_len -= 1;

popped.data.deinit(client);

return client.allocator.destroy(popped);
client.allocator.destroy(popped);
}

if (node.data.proxied) {
Expand Down
24 changes: 24 additions & 0 deletions test/standalone/http.zig
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,30 @@ pub fn main() !void {
// connection has been kept alive
try testing.expect(client.connection_pool.free_len == 1);

{ // issue 16282
const location = try std.fmt.allocPrint(calloc, "http://127.0.0.1:{d}/get", .{port});
defer calloc.free(location);
const uri = try std.Uri.parse(location);

const total_connections = client.connection_pool.free_size + 64;
var requests = try calloc.alloc(http.Client.Request, total_connections);
defer calloc.free(requests);

for (0..total_connections) |i| {
var req = try client.request(.GET, uri, .{ .allocator = calloc }, .{});
req.response.parser.done = true;
req.connection.?.data.closing = false;
requests[i] = req;
}

for (0..total_connections) |i| {
requests[i].deinit();
}

// free connections should be full now
try testing.expect(client.connection_pool.free_len == client.connection_pool.free_size);
}

client.deinit();

killServer(server.socket.listen_address);
Expand Down

0 comments on commit b9fc0d2

Please sign in to comment.