Commit 533049fdd80a4c7bc3098512b4033a60daea745e | zig

author	Nameless <truemedian@gmail.com> 2023-04-28 09:55:23-05:00
committer	Nameless <truemedian@gmail.com> 2023-05-06 21:35:15-05:00
log	533049fdd80a4c7bc3098512b4033a60daea745e
tree	b9cfaedc88cf6931cfb6e19297370f98cbed7505
parent	6513eb4696551a91e322fe2d9879335cd73c92db
signature	Commit is signed but in an unrecognized format.

std.http.Server: use enum for reset state instead of bool

2 files changed, 12 insertions(+), 6 deletions(-)

lib
- std
  - http
    Server.zig
test
- standalone
  - http.zig

lib/std/http/Server.zig+11-5

 @@ -355,17 +355,19 @@ pub const Response = struct {
         }
     }
+    pub const ResetState = enum { reset, closing };
     /// Reset this response to its initial state. This must be called before handling a second request on the same connection.
-    pub fn reset(res: *Response) bool {
+    pub fn reset(res: *Response) ResetState {
         if (res.state == .first) {
             res.state = .start;
-            return true;
+            return .reset;
         }
         if (!res.request.parser.done) {
             // If the response wasn't fully read, then we need to close the connection.
             res.connection.conn.closing = true;
-            return false;
+            return .closing;
         }
         // A connection is only keep-alive if the Connection header is present and it's value is not "close".
 @@ -408,7 +410,11 @@ pub const Response = struct {
             .parser = res.request.parser,
         };
-        return !res.connection.conn.closing;
+        if (res.connection.conn.closing) {
+            return .closing;
+        } else {
+            return .reset;
+        }
     }
     pub const DoError = BufferedConnection.WriteError || error{ UnsupportedTransferEncoding, InvalidContentLength };
 @@ -699,7 +705,7 @@ pub const HeaderStrategy = union(enum) {
     static: []u8,
 };
-/// Accept a new connection and allocate a Response for it.
+/// Accept a new connection.
 pub fn accept(server: *Server, options: HeaderStrategy) AcceptError!Response {
     const in = try server.socket.accept();

test/standalone/http.zig+1-1

...	@@ -122,7 +122,7 @@ fn runServer(srv: *Server) !void {	...	@@ -122,7 +122,7 @@ fn runServer(srv: *Server) !void {
122	var res = try srv.accept(.{ .dynamic = max_header_size });	122	var res = try srv.accept(.{ .dynamic = max_header_size });
123	defer res.deinit();	123	defer res.deinit();
124		124
125	while (res.reset()) {	125	while (res.reset() != .closing) {
126	res.wait() catch \|err\| switch (err) {	126	res.wait() catch \|err\| switch (err) {
127	error.HttpHeadersInvalid => continue :outer,	127	error.HttpHeadersInvalid => continue :outer,
128	error.EndOfStream => continue,	128	error.EndOfStream => continue,