Merge branch v2.11 into v3.6

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

integration/fixtures/websocket/config.toml

@@ -9,8 +9,6 @@
 [entryPoints]
   [entryPoints.web]
     address = ":8000"
-    [entryPoints.web.http.encodedCharacters]
-        allowEncodedSlash = true
 
 [api]
   insecure = true

integration/simple_test.go

@@ -2131,6 +2131,12 @@ func (s *SimpleSuite) TestEncodedCharactersDifferentEntryPoints() {
 			target:   "127.0.0.1:8001", // permissive entry point
 			expected: http.StatusOK,
 		},
+		{
+			desc:     "Encoded slash should be ALLOWED on permissive2 entry point",
+			request:  "GET /path%2Fwith%2Fslash HTTP/1.1\r\nHost: test.localhost\r\n\r\n",
+			target:   "127.0.0.1:8002", // permissive2 entry point
+			expected: http.StatusOK,
+		},
 		{
 			desc:     "Regular path should work on strict entry point",
 			request:  "GET /regular/path HTTP/1.1\r\nHost: test.localhost\r\n\r\n",
@@ -2143,6 +2149,12 @@ func (s *SimpleSuite) TestEncodedCharactersDifferentEntryPoints() {
 			target:   "127.0.0.1:8001",
 			expected: http.StatusOK,
 		},
+		{
+			desc:     "Regular path should work on permissive2 entry point",
+			request:  "GET /regular/path HTTP/1.1\r\nHost: test.localhost\r\n\r\n",
+			target:   "127.0.0.1:8002",
+			expected: http.StatusOK,
+		},
 	}
 
 	for _, test := range testCases {