Support TSR when wildcard follows named param (#321)

julienschmidt · Sep 21, 2020 · fe77dd0 · fe77dd0
1 parent 2d16253
commit fe77dd0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/tree.go b/tree.go
@@ -393,7 +393,7 @@ walk: // Outer loop for walking the tree
 						// No handle found. Check if a handle for this path + a
 						// trailing slash exists for TSR recommendation
 						n = n.children[0]
-						tsr = (n.path == "/" && n.handle != nil)
+						tsr = (n.path == "/" && n.handle != nil) || (n.path == "" && n.indices == "/")
 					}
 
 					return

diff --git a/tree_test.go b/tree_test.go
@@ -392,6 +392,7 @@ func TestTreeTrailingSlashRedirect(t *testing.T) {
 		"/no/a",
 		"/no/b",
 		"/api/hello/:name",
+		"/vendor/:x/*y",
 	}
 	for i := range routes {
 		route := routes[i]
@@ -420,6 +421,7 @@ func TestTreeTrailingSlashRedirect(t *testing.T) {
 		"/admin/config/",
 		"/admin/config/permissions/",
 		"/doc/",
+		"/vendor/x",
 	}
 	for _, route := range tsrRoutes {
 		handler, _, tsr := tree.getValue(route, nil)