Merge branch v2.6 into v2.7

docs/content/reference/dynamic-configuration/file.toml

@@ -186,6 +186,7 @@
         publicKey = "foobar"
         referrerPolicy = "foobar"
         featurePolicy = "foobar"
+        permissionsPolicy = "foobar"
         isDevelopment = true
         [http.middlewares.Middleware10.headers.customRequestHeaders]
           name0 = "foobar"
@@ -243,7 +244,7 @@
     [http.middlewares.Middleware15]
       [http.middlewares.Middleware15.rateLimit]
         average = 42
-        period = 42
+        period = "42s"
         burst = 42
         [http.middlewares.Middleware15.rateLimit.sourceCriterion]
           requestHeaderName = "foobar"
@@ -271,7 +272,7 @@
     [http.middlewares.Middleware20]
       [http.middlewares.Middleware20.retry]
         attempts = 42
-        initialInterval = 42
+        initialInterval = "42s"
     [http.middlewares.Middleware21]
       [http.middlewares.Middleware21.stripPrefix]
         prefixes = ["foobar", "foobar"]
@@ -299,6 +300,8 @@
         dialTimeout = "42s"
         responseHeaderTimeout = "42s"
         idleConnTimeout = "42s"
+        readIdleTimeout = "42s"
+        pingTimeout = "42s"
     [http.serversTransports.ServersTransport1]
       serverName = "foobar"
       insecureSkipVerify = true
@@ -318,6 +321,8 @@
         dialTimeout = "42s"
         responseHeaderTimeout = "42s"
         idleConnTimeout = "42s"
+        readIdleTimeout = "42s"
+        pingTimeout = "42s"
 
 [tcp]
   [tcp.routers]
@@ -380,9 +385,12 @@
           name = "foobar"
           weight = 42
   [tcp.middlewares]
-    [tcp.middlewares.Middleware00]
-      [tcp.middlewares.Middleware00.ipWhiteList]
-      sourceRange = ["foobar", "foobar"]
+    [tcp.middlewares.TCPMiddleware00]
+      [tcp.middlewares.TCPMiddleware00.ipWhiteList]
+        sourceRange = ["foobar", "foobar"]
+    [tcp.middlewares.TCPMiddleware01]
+      [tcp.middlewares.TCPMiddleware01.inFlightConn]
+        amount = 42
 
 [udp]
   [udp.routers]