diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e0fbf03c..7906983d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [v3.2.5](https://github.com/traefik/traefik/tree/v3.2.5) (2025-01-07) +[All Commits](https://github.com/traefik/traefik/compare/v3.2.4...v3.2.5) + +**Bug fixes:** +- **[websocket,server]** Disable http2 connect setting for websocket by default ([#11408](https://github.com/traefik/traefik/pull/11408) by [rtribotte](https://github.com/rtribotte)) + ## [v3.3.0](https://github.com/traefik/traefik/tree/v3.3.0) (2025-01-06) [All Commits](https://github.com/traefik/traefik/compare/v3.2.0-rc1...v3.3.0) diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index bb037208d..588e320ff 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -27,6 +27,7 @@ import ( "github.com/traefik/traefik/v3/cmd" "github.com/traefik/traefik/v3/cmd/healthcheck" cmdVersion "github.com/traefik/traefik/v3/cmd/version" + _ "github.com/traefik/traefik/v3/init" tcli "github.com/traefik/traefik/v3/pkg/cli" "github.com/traefik/traefik/v3/pkg/collector" "github.com/traefik/traefik/v3/pkg/config/dynamic" diff --git a/init/init.go b/init/init.go new file mode 100644 index 000000000..e54655d0f --- /dev/null +++ b/init/init.go @@ -0,0 +1,21 @@ +package init + +import ( + "os" + "strings" +) + +// This makes use of the GODEBUG flag `http2xconnect` to deactivate the connect setting for HTTP2 by default. +// This type of upgrade is yet incompatible with `net/http` http1 reverse proxy. +// Please see https://github.com/golang/go/issues/71128#issuecomment-2574193636. +func init() { + goDebug := os.Getenv("GODEBUG") + if strings.Contains(goDebug, "http2xconnect") { + return + } + + if len(goDebug) > 0 { + goDebug += "," + } + os.Setenv("GODEBUG", goDebug+"http2xconnect=0") +} diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 5656b8bb4..0059c5ef5 100644 --- a/script/gcg/traefik-bugfix.toml +++ b/script/gcg/traefik-bugfix.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example new bugfix v3.2.4 +# example new bugfix v3.2.5 CurrentRef = "v3.2" -PreviousRef = "v3.2.3" +PreviousRef = "v3.2.4" BaseBranch = "v3.2" -FutureCurrentRefName = "v3.2.4" +FutureCurrentRefName = "v3.2.5" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10