Skip to content

Commit

Permalink
param wildcard capture fixed to *
Browse files Browse the repository at this point in the history
Signed-off-by: Vishal Rana <[email protected]>
  • Loading branch information
vishr committed Oct 11, 2016
1 parent 8623669 commit 2eb87f8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion echo.go
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ func (e *Echo) Match(methods []string, path string, handler HandlerFunc, middlew
// provided root directory.
func (e *Echo) Static(prefix, root string) {
e.GET(prefix+"*", func(c Context) error {
return c.File(path.Join(root, c.Param("_*")))
return c.File(path.Join(root, c.Param("*")))
})
}

Expand Down
2 changes: 1 addition & 1 deletion middleware/static.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
fs := http.Dir(config.Root)
p := c.Request().URL.Path
if strings.Contains(c.Path(), "*") { // If serving from a group, e.g. `/static*`.
p = c.Param("_*")
p = c.Param("*")
}
file := path.Clean(p)
f, err := fs.Open(file)
Expand Down
2 changes: 1 addition & 1 deletion router.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (r *Router) Add(method, path string, h HandlerFunc, e *Echo) {
r.insert(method, path[:i], nil, pkind, ppath, pnames, e)
} else if path[i] == '*' {
r.insert(method, path[:i], nil, skind, "", nil, e)
pnames = append(pnames, "_*")
pnames = append(pnames, "*")
r.insert(method, path[:i+1], h, akind, ppath, pnames, e)
return
}
Expand Down
6 changes: 3 additions & 3 deletions router_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,10 @@ func TestRouterMatchAny(t *testing.T) {
assert.Equal(t, "", c.Param("_*"))

r.Find(GET, "/download", c)
assert.Equal(t, "download", c.Param("_*"))
assert.Equal(t, "download", c.Param("*"))

r.Find(GET, "/users/joe", c)
assert.Equal(t, "joe", c.Param("_*"))
assert.Equal(t, "joe", c.Param("*"))
}

func TestRouterMicroParam(t *testing.T) {
Expand Down Expand Up @@ -483,7 +483,7 @@ func TestRouterPriority(t *testing.T) {
r.Find(GET, "/users/joe/books", c)
c.handler(c)
assert.Equal(t, 7, c.Get("g"))
assert.Equal(t, "joe/books", c.Param("_*"))
assert.Equal(t, "joe/books", c.Param("*"))
}

// Issue #372
Expand Down

0 comments on commit 2eb87f8

Please sign in to comment.