From 350170e0f2a2d26a79924d24b32468057719cf60 Mon Sep 17 00:00:00 2001 From: Samuel Johnson Date: Tue, 25 Nov 2025 21:32:18 -0500 Subject: Adapt code for earlier go version on server --- cmd/web/handlers/fs.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cmd/web/handlers/fs.go b/cmd/web/handlers/fs.go index 629a7e1..aa6bbc5 100644 --- a/cmd/web/handlers/fs.go +++ b/cmd/web/handlers/fs.go @@ -2,6 +2,7 @@ package handlers import ( "encoding/json" + "io" "log" "net/http" "os" @@ -42,7 +43,15 @@ func (ctx *fsContext) get(w http.ResponseWriter, r *http.Request) { } defer root.Close() - file, err := root.ReadFile(name) + file, err := root.Open(name) + if err != nil { + ctx.err.Print(err.Error()) + http.Error(w, "Internal Server Error", 500) + return + } + defer file.Close() + + content, err := io.ReadAll(file) if err != nil { ctx.err.Print(err.Error()) http.Error(w, "Internal Server Error", 500) @@ -64,5 +73,5 @@ func (ctx *fsContext) get(w http.ResponseWriter, r *http.Request) { } } - w.Write(file) + w.Write(content) } -- cgit v1.2.3