Skip to content

Commit 7e65666

Browse files
author
squiidz
committed
update match function
1 parent b394810 commit 7e65666

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

route.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,27 +94,27 @@ func (r *Route) Match(req *http.Request) bool {
9494
ss := strings.Split(req.URL.Path, "/")
9595

9696
if r.matchRawTokens(&ss) {
97-
//
98-
if vars.v[req] == nil {
99-
vars.Lock()
100-
vars.v[req] = make(map[string]string)
101-
vars.Unlock()
102-
}
103-
for k, v := range r.Pattern {
104-
if len(ss) >= r.Token.Size {
97+
if len(ss) >= r.Token.Size {
98+
99+
if vars.v[req] == nil {
100+
vars.Lock()
101+
vars.v[req] = make(map[string]string)
102+
vars.Unlock()
103+
}
104+
for k, v := range r.Pattern {
105105
vars.v[req][v] = ss[k]
106106
}
107-
}
108-
if r.Atts&REGEX != 0 {
109-
for k, v := range r.Compile {
110-
if !v.MatchString(ss[k]) {
111-
return false
107+
if r.Atts&REGEX != 0 {
108+
for k, v := range r.Compile {
109+
if !v.MatchString(ss[k]) {
110+
return false
111+
}
112+
vars.v[req][r.Tag[k]] = ss[k]
112113
}
113-
vars.v[req][r.Tag[k]] = ss[k]
114114
}
115-
}
116115

117-
return true
116+
return true
117+
}
118118
}
119119
return false
120120
}

0 commit comments

Comments
 (0)