mirrors/zap
1
0
Fork 0
mirror of https://github.com/zigzap/zap.git synced 2025-10-20 15:14:08 +00:00
Code Activity

fix app_basic 0.15.1

Browse source
This commit is contained in:
renerocksai 2025-08-28 20:24:35 +02:00
parent f4d1ac0a30
commit 5740b3b1a1
No known key found for this signature in database
2 changed files with 14 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/app/basic.zig
View file

@ -57,7 +57,7 @@ const SimpleEndpoint = struct {
.{ context.db_connection, e.some_data, arena.ptr, thread_id }, .{ context.db_connection, e.some_data, arena.ptr, thread_id },
); );
try r.sendBody(response_text); try r.sendBody(response_text);
std.time.sleep(std.time.ns_per_ms * 300); std.Thread.sleep(std.time.ns_per_ms * 300);
} }
}; };

44
src/request.zig
View file

@ -263,12 +263,7 @@ pub fn fiobj2HttpParam(a: Allocator, o: fio.FIOBJ) !?HttpParam {
}; };
} }
pub const CookieSameSite = enum(u8) { pub const CookieSameSite = enum(u8) { Default, Lax, Strict, None };
Default,
Lax,
Strict,
None
};
/// Args for setting a cookie /// Args for setting a cookie
pub const CookieArgs = struct { pub const CookieArgs = struct {
@ -359,20 +354,16 @@ pub fn _internal_sendError(self: *const Request, err: anyerror, err_trace: ?std.
// TODO: let's hope 20k is enough. Maybe just really allocate here // TODO: let's hope 20k is enough. Maybe just really allocate here
self.h.*.status = errorcode_num; self.h.*.status = errorcode_num;
var buf: [20 * 1024]u8 = undefined; var buf: [20 * 1024]u8 = undefined;
var fba = std.heap.FixedBufferAllocator.init(&buf); var writer = std.io.Writer.fixed(&buf);
var string = std.ArrayList(u8).init(fba.allocator());
var writer = string.writer();
// TODO: fix this when 0.15 is released?
var new_api_adapter = writer.adaptToNewApi();
try writer.print("ERROR: {any}\n\n", .{err}); try writer.print("ERROR: {any}\n\n", .{err});
if (err_trace) |trace| { if (err_trace) |trace| {
const debugInfo = try std.debug.getSelfDebugInfo(); const debugInfo = try std.debug.getSelfDebugInfo();
const ttyConfig: std.io.tty.Config = .no_color; const ttyConfig: std.io.tty.Config = .no_color;
try std.debug.writeStackTrace(trace, &new_api_adapter.new_interface, debugInfo, ttyConfig); try std.debug.writeStackTrace(trace, &writer, debugInfo, ttyConfig);
} }
try self.sendBody(string.items); try self.sendBody(writer.buffered());
} }
/// Send body. /// Send body.
@ -682,28 +673,15 @@ pub fn parseAcceptHeaders(self: *const Request, allocator: Allocator) !AcceptHea
/// Set a response cookie /// Set a response cookie
pub fn setCookie(self: *const Request, args: CookieArgs) HttpError!void { pub fn setCookie(self: *const Request, args: CookieArgs) HttpError!void {
const c: fio.http_cookie_args_s = .{ const c: fio.http_cookie_args_s = .{ .name = util.toCharPtr(args.name), .name_len = @as(isize, @intCast(args.name.len)), .value = util.toCharPtr(args.value), .value_len = @as(isize, @intCast(args.value.len)), .domain = if (args.domain) |p| util.toCharPtr(p) else null, .domain_len = if (args.domain) |p| @as(isize, @intCast(p.len)) else 0, .path = if (args.path) |p| util.toCharPtr(p) else null, .path_len = if (args.path) |p| @as(isize, @intCast(p.len)) else 0, .max_age = args.max_age_s, .flags = (((if (args.secure) @as(c_uint, 1) else 0) << 0) |
.name = util.toCharPtr(args.name), ((if (args.http_only) @as(c_uint, 1) else 0) << 1) |
.name_len = @as(isize, @intCast(args.name.len)), ((if (args.partitioned) @as(c_uint, 1) else 0) << 2) |
.value = util.toCharPtr(args.value),
.value_len = @as(isize, @intCast(args.value.len)),
.domain = if (args.domain) |p| util.toCharPtr(p) else null,
.domain_len = if (args.domain) |p| @as(isize, @intCast(p.len)) else 0,
.path = if (args.path) |p| util.toCharPtr(p) else null,
.path_len = if (args.path) |p| @as(isize, @intCast(p.len)) else 0,
.max_age = args.max_age_s,
.flags = (
((if (args.secure) @as(c_uint,1) else 0) << 0) |
((if (args.http_only) @as(c_uint,1) else 0) << 1) |
((if (args.partitioned) @as(c_uint,1) else 0) << 2) |
((switch (args.same_site) { ((switch (args.same_site) {
.Default => @as(c_uint, 0), .Default => @as(c_uint, 0),
.Lax => @as(c_uint,1), .Lax => @as(c_uint, 1),
.Strict => @as(c_uint,2), .Strict => @as(c_uint, 2),
.None => @as(c_uint,3) .None => @as(c_uint, 3),
}) << 3) }) << 3)) };
)
};
// TODO WAT? // TODO WAT?
// if we: // if we: