From 2d4b264527825feee15de3c2fdf625845e705e32 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 22 May 2024 07:13:08 -0700 Subject: [PATCH] std autodocs server: don't trim all URLs This is a partial revert of 6635360dbdbd6793b741648d51d25f12550e01db. --- lib/compiler/std-docs.zig | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/compiler/std-docs.zig b/lib/compiler/std-docs.zig index ec324e065d..4642b4317f 100644 --- a/lib/compiler/std-docs.zig +++ b/lib/compiler/std-docs.zig @@ -116,19 +116,21 @@ const Context = struct { }; fn serveRequest(request: *std.http.Server.Request, context: *Context) !void { - const target = std.mem.trimRight(u8, request.head.target, "/"); - if (target.len == 0 or std.mem.eql(u8, target, "/debug")) { + if (std.mem.eql(u8, request.head.target, "/") or + std.mem.eql(u8, request.head.target, "/debug") or + std.mem.eql(u8, request.head.target, "/debug/")) + { try serveDocsFile(request, context, "docs/index.html", "text/html"); - } else if (std.mem.eql(u8, target, "/main.js") or - std.mem.eql(u8, target, "/debug/main.js")) + } else if (std.mem.eql(u8, request.head.target, "/main.js") or + std.mem.eql(u8, request.head.target, "/debug/main.js")) { try serveDocsFile(request, context, "docs/main.js", "application/javascript"); - } else if (std.mem.eql(u8, target, "/main.wasm")) { + } else if (std.mem.eql(u8, request.head.target, "/main.wasm")) { try serveWasm(request, context, .ReleaseFast); - } else if (std.mem.eql(u8, target, "/debug/main.wasm")) { + } else if (std.mem.eql(u8, request.head.target, "/debug/main.wasm")) { try serveWasm(request, context, .Debug); - } else if (std.mem.eql(u8, target, "/sources.tar") or - std.mem.eql(u8, target, "/debug/sources.tar")) + } else if (std.mem.eql(u8, request.head.target, "/sources.tar") or + std.mem.eql(u8, request.head.target, "/debug/sources.tar")) { try serveSourcesTar(request, context); } else {