mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 21:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.http.Server: move closing bool

Browse Source 
It does not belong in the Connection struct
This commit is contained in:
Andrew Kelley 2024-02-18 20:26:09 -07:00
parent 6129ecd4fe
commit c7fc2d76ce
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/std/http/Server.zig
View File

@ -4,6 +4,7 @@ reason: ?[]const u8,
transfer_encoding: ResponseTransfer,
keep_alive: bool,
connection: Connection,
connection_closing: bool,
/// Externally-owned; must outlive the Server.
extra_headers: []const http.Header,
@ -25,11 +26,11 @@ pub fn init(connection: std.net.Server.Connection, options: Server.Request.InitO
.connection = .{
.stream = connection.stream,
.protocol = .plain,
.closing = true,
.read_buf = undefined,
.read_start = 0,
.read_end = 0,
},
.connection_closing = true,
.request = Server.Request.init(options),
.version = .@"HTTP/1.1",
.status = .ok,
@ -232,7 +233,7 @@ pub fn reset(res: *Server) ResetState {
if (!res.request.parser.done) {
// If the response wasn't fully read, then we need to close the connection.
res.connection.closing = true;
res.connection_closing = true;
return .closing;
}
@ -240,7 +241,7 @@ pub fn reset(res: *Server) ResetState {
// and its value is not "close". The server and client must both agree.
//
// send() defaults to using keep-alive if the client requests it.
res.connection.closing = !res.keep_alive or !res.request.keep_alive;
res.connection_closing = !res.keep_alive or !res.request.keep_alive;
res.state = .start;
res.version = .@"HTTP/1.1";
@ -253,7 +254,7 @@ pub fn reset(res: *Server) ResetState {
.client_header_buffer = res.request.parser.header_bytes_buffer,
});
return if (res.connection.closing) .closing else .reset;
return if (res.connection_closing) .closing else .reset;
}
pub const SendError = Connection.WriteError || error{

2
lib/std/http/Server/Connection.zig
View File

@ -1,8 +1,6 @@
stream: std.net.Stream,
protocol: Protocol,
closing: bool,
read_buf: [buffer_size]u8,
read_start: u16,
read_end: u16,