encode: Slight fix for the previous commit

caddyserver · Apr 18, 2024 · 9ab0943 · 9ab0943
1 parent 3067074
commit 9ab0943
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/modules/caddyhttp/encode/encode.go b/modules/caddyhttp/encode/encode.go
@@ -164,8 +164,11 @@ func (enc *Encode) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyh
 			// we have to strip our addition so the upstream handlers can still honor client
 			// caches without knowing about our changes...
 			if etag := r.Header.Get("If-None-Match"); etag != "" && !strings.HasPrefix(etag, "W/") {
-				etag = strings.TrimSuffix(etag, "-"+encName+`"`) + `"`
-				r.Header.Set("If-None-Match", etag)
+				ourSuffix := "-" + encName + `"`
+				if strings.HasSuffix(etag, ourSuffix) {
+					etag = strings.TrimSuffix(etag, ourSuffix) + `"`
+					r.Header.Set("If-None-Match", etag)
+				}
 			}
 
 			break