mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.http.Server.Connection: remove dead code

Browse source
This commit is contained in:
Andrew Kelley 2024-02-18 20:27:49 -07:00
parent c7fc2d76ce
commit 968d08af6d
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/std/http/Server.zig
View file

@ -25,7 +25,6 @@ pub fn init(connection: std.net.Server.Connection, options: Server.Request.InitO
.keep_alive = true, .keep_alive = true,
.connection = .{ .connection = .{
.stream = connection.stream, .stream = connection.stream,
.protocol = .plain,
.read_buf = undefined, .read_buf = undefined,
.read_start = 0, .read_start = 0,
.read_end = 0, .read_end = 0,

17
lib/std/http/Server/Connection.zig
View file

@ -1,18 +1,13 @@
stream: std.net.Stream, stream: std.net.Stream,
protocol: Protocol,
read_buf: [buffer_size]u8, read_buf: [buffer_size]u8,
read_start: u16, read_start: u16,
read_end: u16, read_end: u16,
pub const buffer_size = std.crypto.tls.max_ciphertext_record_len; pub const buffer_size = std.crypto.tls.max_ciphertext_record_len;
pub const Protocol = enum { plain };
pub fn rawReadAtLeast(conn: *Connection, buffer: []u8, len: usize) ReadError!usize { pub fn rawReadAtLeast(conn: *Connection, buffer: []u8, len: usize) ReadError!usize {
return switch (conn.protocol) { return conn.stream.readAtLeast(buffer, len) catch |err| {
.plain => conn.stream.readAtLeast(buffer, len),
// .tls => conn.tls_client.readAtLeast(conn.stream, buffer, len),
} catch |err| {
switch (err) { switch (err) {
error.ConnectionResetByPeer, error.BrokenPipe => return error.ConnectionResetByPeer, error.ConnectionResetByPeer, error.BrokenPipe => return error.ConnectionResetByPeer,
else => return error.UnexpectedReadFailure, else => return error.UnexpectedReadFailure,
@ -91,20 +86,14 @@ pub fn reader(conn: *Connection) Reader {
} }
pub fn writeAll(conn: *Connection, buffer: []const u8) WriteError!void { pub fn writeAll(conn: *Connection, buffer: []const u8) WriteError!void {
return switch (conn.protocol) { return conn.stream.writeAll(buffer) catch |err| switch (err) {
.plain => conn.stream.writeAll(buffer),
// .tls => return conn.tls_client.writeAll(conn.stream, buffer),
} catch |err| switch (err) {
error.BrokenPipe, error.ConnectionResetByPeer => return error.ConnectionResetByPeer, error.BrokenPipe, error.ConnectionResetByPeer => return error.ConnectionResetByPeer,
else => return error.UnexpectedWriteFailure, else => return error.UnexpectedWriteFailure,
}; };
} }
pub fn write(conn: *Connection, buffer: []const u8) WriteError!usize { pub fn write(conn: *Connection, buffer: []const u8) WriteError!usize {
return switch (conn.protocol) { return conn.stream.write(buffer) catch |err| switch (err) {
.plain => conn.stream.write(buffer),
// .tls => return conn.tls_client.write(conn.stream, buffer),
} catch |err| switch (err) {
error.BrokenPipe, error.ConnectionResetByPeer => return error.ConnectionResetByPeer, error.BrokenPipe, error.ConnectionResetByPeer => return error.ConnectionResetByPeer,
else => return error.UnexpectedWriteFailure, else => return error.UnexpectedWriteFailure,
}; };