Merge branch v2.11 into v3.6

2026-01-14 11:28:12 +01:00 · 2026-01-14 11:28:12 +01:00 · 8479d66d18
commit 8479d66d18
parent 794916a183 9e5d4ba5a1
23 changed files with 266 additions and 224 deletions
--- a/integration/fixtures/simple_encoded_chars.toml
+++ b/integration/fixtures/simple_encoded_chars.toml
@ -8,12 +8,18 @@
 [entryPoints]
  [entryPoints.strict]
    address = ":8000"
-    # Default: no encoded characters allowed
+    [entryPoints.strict.http.encodedCharacters]
+        allowEncodedSlash = false

  [entryPoints.permissive]
    address = ":8001"
+    # No config, default values should apply
+
+  [entryPoints.permissive2]
+    address = ":8002"
+    # No config for allowEncodedSlash, default value is effectively true
    [entryPoints.permissive.http.encodedCharacters]
-      allowEncodedSlash = true
+        allowEncodedBackSlash = false

 [api]
  insecure = true
--- a/integration/fixtures/websocket/config.toml
+++ b/integration/fixtures/websocket/config.toml
@ -9,8 +9,6 @@
 [entryPoints]
  [entryPoints.web]
    address = ":8000"
-    [entryPoints.web.http.encodedCharacters]
-        allowEncodedSlash = true

 [api]
  insecure = true