hotfix(wildpath): set user empty value (#47)

* hotfix(wildpath): set user empty value * fix(tree): modify tree ut
fasthttp · Mar 1, 2021 · f74be76 · f74be76
1 parent 0f5bbd6
commit f74be76
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/radix/node.go b/radix/node.go
@@ -315,7 +315,7 @@ walk:
 						return child.handler, false
 					case child.wildcard != nil:
 						if ctx != nil {
-							ctx.SetUserValue(child.wildcard.paramKey, copyString(path))
+							ctx.SetUserValue(child.wildcard.paramKey, "")
 						}
 
 						return child.wildcard.handler, false

diff --git a/radix/node_test.go b/radix/node_test.go
@@ -173,7 +173,7 @@ func TestTreeWildcard(t *testing.T) {
 		{"/cmd/test/", false, "/cmd/{tool}/", map[string]interface{}{"tool": "test"}},
 		{"/cmd/test", true, "", nil},
 		{"/cmd/test/3", false, "/cmd/{tool}/{sub}", map[string]interface{}{"tool": "test", "sub": "3"}},
-		{"/src/", false, "/src/{filepath:*}", map[string]interface{}{"filepath": "/"}},
+		{"/src/", false, "/src/{filepath:*}", map[string]interface{}{"filepath": ""}},
 		{"/src/some/file.png", false, "/src/{filepath:*}", map[string]interface{}{"filepath": "some/file.png"}},
 		{"/search/", false, "/search/", nil},
 		{"/search/someth!ng+in+ünìcodé", false, "/search/{query}", map[string]interface{}{"query": "someth!ng+in+ünìcodé"}},

diff --git a/radix/tree.go b/radix/tree.go
@@ -86,7 +86,7 @@ func (t *Tree) Get(path string, ctx *fasthttp.RequestCtx) (fasthttp.RequestHandl
 			return t.root.handler, false
 		case t.root.wildcard != nil:
 			if ctx != nil {
-				ctx.SetUserValue(t.root.wildcard.paramKey, "/")
+				ctx.SetUserValue(t.root.wildcard.paramKey, "")
 			}
 
 			return t.root.wildcard.handler, false

diff --git a/radix/tree_test.go b/radix/tree_test.go
@@ -238,7 +238,7 @@ func Test_TreeRootWildcard(t *testing.T) {
 	tree.Add("/{filepath:*}", handler)
 
 	testHandlerAndParams(t, tree, "/", handler, false, map[string]interface{}{
-		"filepath": "/",
+		"filepath": "",
 	})
 }