Merge branch v2.11 into v3.0

pkg/redactor/redactor_config_test.go

@@ -511,6 +511,8 @@ func TestDo_staticConfiguration(t *testing.T) {
 		SendAnonymousUsage: true,
 	}
 
+	paerserDuration := ptypes.Duration(111 * time.Second)
+
 	config.EntryPoints = static.EntryPoints{
 		"foobar": &static.EntryPoint{
 			Address: "foo Address",
@@ -520,9 +522,14 @@ func TestDo_staticConfiguration(t *testing.T) {
 					GraceTimeOut:              ptypes.Duration(111 * time.Second),
 				},
 				RespondingTimeouts: &static.RespondingTimeouts{
-					ReadTimeout:  ptypes.Duration(111 * time.Second),
-					WriteTimeout: ptypes.Duration(111 * time.Second),
-					IdleTimeout:  ptypes.Duration(111 * time.Second),
+					HTTP: &static.HTTPRespondingTimeouts{
+						ReadTimeout:  &paerserDuration,
+						WriteTimeout: &paerserDuration,
+						IdleTimeout:  &paerserDuration,
+					},
+					TCP: &static.TCPRespondingTimeouts{
+						LingeringTimeout: ptypes.Duration(111 * time.Second),
+					},
 				},
 			},
 			ProxyProtocol: &static.ProxyProtocol{

pkg/redactor/testdata/anonymized-static-config.json

@@ -38,9 +38,14 @@
           "graceTimeOut": "1m51s"
         },
         "respondingTimeouts": {
-          "readTimeout": "1m51s",
-          "writeTimeout": "1m51s",
-          "idleTimeout": "1m51s"
+          "http": {
+            "readTimeout": "1m51s",
+            "writeTimeout": "1m51s",
+            "idleTimeout": "1m51s"
+          },
+          "tcp": {
+            "lingeringTimeout": "1m51s"
+          }
         }
       },
       "proxyProtocol": {