1
0
mirror of https://github.com/containous/traefik.git synced 2025-03-11 16:58:23 +03:00

Merge current branch v3.2 into v3.3

This commit is contained in:
romain 2025-01-07 15:14:43 +01:00
commit 456188fa0d
4 changed files with 31 additions and 3 deletions

View File

@ -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)

View File

@ -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"

21
init/init.go Normal file
View File

@ -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")
}

View File

@ -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