Fix set Cache-Control header position

oursky · Jan 9, 2024 · 8bdb787 · 8bdb787
1 parent eb4731b
commit 8bdb787
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,8 @@
 *.test
 *.out
 go.work
-
+pageship
 *.local
 .env
 dist/
-/book
+/book
diff --git a/internal/handler/site/site_handler.go b/internal/handler/site/site_handler.go
@@ -49,7 +49,6 @@ func (h *SiteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 		h.next.ServeHTTP(w, r)
 
-    w.Header().Set("Cache-Control", "public, max-age=31536000, no-cache")
 	case http.MethodOptions:
 		w.Header().Set("Allow", options)
 
@@ -72,9 +71,9 @@ func (h *SiteHandler) serveFile(w http.ResponseWriter, r *http.Request) {
 	if info.ContentType != "" {
 		w.Header().Set("Content-Type", info.ContentType)
 	}
-    w.Header().Set("Cache-Control", "public, max-age=31536000, no-cache")
 	if info.Hash != "" {
 		w.Header().Set("ETag", fmt.Sprintf(`"%s"`, info.Hash))
+		w.Header().Set("Cache-Control", "public, max-age=31536000, no-cache")
 	}
 
 	reader := &lazyReader{