From 756e91acdde99264e362a689bfa9ea1f7e339cd2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 7 Apr 2026 10:48:05 +0200 Subject: [PATCH] Bump github.com/klauspost/compress v1.18.4 and fix TestNegotiation --- go.mod | 2 +- go.sum | 4 ++-- pkg/middlewares/compress/compress_test.go | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index becc90a96c..150ce00e19 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/http-wasm/http-wasm-host-go v0.7.0 github.com/influxdata/influxdb-client-go/v2 v2.7.0 github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab // No tag on the repo. - github.com/klauspost/compress v1.18.2 + github.com/klauspost/compress v1.18.5 github.com/kvtools/consul v1.0.2 github.com/kvtools/etcdv3 v1.0.3 github.com/kvtools/redis v1.2.0 diff --git a/go.sum b/go.sum index 703e10109c..820b3b8885 100644 --- a/go.sum +++ b/go.sum @@ -790,8 +790,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk= -github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= +github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00= diff --git a/pkg/middlewares/compress/compress_test.go b/pkg/middlewares/compress/compress_test.go index 9754de238a..a2b77869d8 100644 --- a/pkg/middlewares/compress/compress_test.go +++ b/pkg/middlewares/compress/compress_test.go @@ -93,9 +93,14 @@ func TestNegotiation(t *testing.T) { expEncoding: gzipName, }, { - desc: "multi accept header list, prefer gzip", + // github.com/klauspost/compress v1.18.4 and up use zstd + // as preferred compression if all accept headers have + // an equal "q" (implicit "q=1.0"). + // + // see https://github.com/klauspost/compress/pull/1121 + desc: "multi accept header list, prefer best", acceptEncHeader: "gzip, br, zstd", - expEncoding: gzipName, + expEncoding: zstdName, }, }