Merge remote-tracking branch 'upstream/v2.2' into mrg-current-v2.2

2020-07-10 10:46:11 +02:00 · 2020-07-10 10:46:11 +02:00 · 73ca7ad0c1
commit 73ca7ad0c1
parent ed216bea4d d7f517fbf5
156 changed files with 1768 additions and 892 deletions
--- a/pkg/middlewares/headers/headers_test.go
+++ b/pkg/middlewares/headers/headers_test.go
@ -552,7 +552,8 @@ func TestCORSResponses(t *testing.T) {
 			expected: map[string][]string{
 				"Access-Control-Allow-Origin": {"*"},
 			},
-		}, {
+		},
+		{
 			desc: "Test Simple CustomRequestHeaders Not Hijacked by CORS",
 			header: NewHeader(emptyHandler, dynamic.Headers{
 				CustomRequestHeaders: map[string]string{"foo": "bar"},