From 38fba5916c941fd7740407ef23db63ed72fc96d9 Mon Sep 17 00:00:00 2001
From: a <a@tuxpa.in>
Date: Mon, 24 Jun 2024 11:49:49 -0500
Subject: [PATCH] fix rebase

---
 modules/caddyhttp/fileserver/staticfiles.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/caddyhttp/fileserver/staticfiles.go b/modules/caddyhttp/fileserver/staticfiles.go
index 5d54742dd..33a7786d6 100644
--- a/modules/caddyhttp/fileserver/staticfiles.go
+++ b/modules/caddyhttp/fileserver/staticfiles.go
@@ -15,6 +15,7 @@
 package fileserver
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"io"
@@ -690,6 +691,9 @@ func (fsrv *FileServer) getEtagFromFile(fileSystem fs.FS, filename string) (stri
 		if err != nil {
 			return "", fmt.Errorf("cannot read etag from file %s: %v", etagFilename, err)
 		}
+
+		// Etags should not contain newline characters
+		etag = bytes.ReplaceAll(etag, []byte("\n"), []byte{})
 		return string(etag), nil
 	}
 	return "", nil