Merge v2.10 into v3.0

2023-11-29 12:20:57 +01:00 · 2023-11-29 12:20:57 +01:00 · e29a142f6a
commit e29a142f6a
parent 35c704ace3 dae0491b61
118 changed files with 1324 additions and 1290 deletions
--- a/pkg/muxer/tcp/mux_test.go
+++ b/pkg/muxer/tcp/mux_test.go
@ -309,7 +309,7 @@ func Test_addTCPRoute(t *testing.T) {
 			matchingHandler.ServeTCP(conn)

 			n, ok := conn.call[msg]
-			assert.Equal(t, n, 1)
+			assert.Equal(t, 1, n)
 			assert.True(t, ok)
 		})
 	}