Skip to content

Commit

Permalink
update match function
Browse files Browse the repository at this point in the history
  • Loading branch information
squiidz committed Oct 5, 2015
1 parent b394810 commit 7e65666
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions route.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,27 +94,27 @@ func (r *Route) Match(req *http.Request) bool {
ss := strings.Split(req.URL.Path, "/")

if r.matchRawTokens(&ss) {
//
if vars.v[req] == nil {
vars.Lock()
vars.v[req] = make(map[string]string)
vars.Unlock()
}
for k, v := range r.Pattern {
if len(ss) >= r.Token.Size {
if len(ss) >= r.Token.Size {

if vars.v[req] == nil {
vars.Lock()
vars.v[req] = make(map[string]string)
vars.Unlock()
}
for k, v := range r.Pattern {
vars.v[req][v] = ss[k]
}
}
if r.Atts&REGEX != 0 {
for k, v := range r.Compile {
if !v.MatchString(ss[k]) {
return false
if r.Atts&REGEX != 0 {
for k, v := range r.Compile {
if !v.MatchString(ss[k]) {
return false
}
vars.v[req][r.Tag[k]] = ss[k]
}
vars.v[req][r.Tag[k]] = ss[k]
}
}

return true
return true
}
}
return false
}
Expand Down

0 comments on commit 7e65666

Please sign in to comment.