From 9ab09433deba62f9f2b37d824570926f7ee69312 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 17 Apr 2024 19:59:10 -0600 Subject: [PATCH] encode: Slight fix for the previous commit --- modules/caddyhttp/encode/encode.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/caddyhttp/encode/encode.go b/modules/caddyhttp/encode/encode.go index f4bd7ae4..0c8a10de 100644 --- 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