Merge current v2.6 into master

This commit is contained in:
Tom Moulard 2022-02-21 14:05:28 +01:00
commit 25725e9b2f
No known key found for this signature in database
GPG key ID: 521ABE0C1A0DEAF6
45 changed files with 155 additions and 99 deletions

View file

@ -351,7 +351,6 @@ func (s *ConsulCatalogSuite) TestDefaultConsulService(c *check.C) {
ConsulAddress string
DefaultRule string
}{
ConsulAddress: s.consulURL,
DefaultRule: "Host(`{{ normalize .Name }}.consul.localhost`)",
}

View file

@ -500,7 +500,7 @@ func (s *WebsocketSuite) TestSSLhttp2(c *check.C) {
c.Assert(string(msg), checker.Equals, "OK")
}
func (s *WebsocketSuite) TestHeaderAreForwared(c *check.C) {
func (s *WebsocketSuite) TestHeaderAreForwarded(c *check.C) {
upgrader := gorillawebsocket.Upgrader{} // use default options
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {