Merge branch 'fix/catch-serve-errors' into 'master'

fix: catch io.copy errors when serving content

See merge request gitlab-org/gitlab-pages!676

1 files changed, 9 insertions, 2 deletions

diff --git a/internal/vfs/serving/serving.go b/internal/vfs/serving/serving.go
index 6f45e1d5..57b0228f 100644
--- a/internal/vfs/serving/serving.go
+++ b/internal/vfs/serving/serving.go
@@ -47,10 +47,17 @@ func serveContent(w http.ResponseWriter, r *http.Request, modtime time.Time, con
 		return
 	}
 
-	w.WriteHeader(code)
+	if r.Method == http.MethodHead {
+		w.WriteHeader(code)
+		return
+	}
 
 	if r.Method != http.MethodHead {
-		io.Copy(w, content)
+		if _, err := io.Copy(w, content); err != nil {
+			errortracking.Capture(err, errortracking.WithRequest(r), errortracking.WithStackTrace())
+			logging.LogRequest(r).WithError(err).Error("error serving content")
+			httperrors.Serve500(w)
+		}
 	}
 }