Browse Source

fix for empty query

Bay Dodd 11 years ago
parent
commit
2b32409792
2 changed files with 13 additions and 1 deletions
  1. +9
    -0
      mux_test.go
  2. +4
    -1
      regexp.go

+ 9
- 0
mux_test.go View File

@ -588,6 +588,15 @@ func TestQueries(t *testing.T) {
path: "",
shouldMatch: false,
},
{
title: "Queries route with empty value, should match",
route: new(Route).Queries("foo", ""),
request: newRequest("GET", "http://localhost?foo=bar"),
vars: map[string]string{},
host: "",
path: "",
shouldMatch: true,
},
}
for _, test := range tests {


+ 4
- 1
regexp.go View File

@ -34,7 +34,7 @@ func newRouteRegexp(tpl string, matchHost, matchPrefix, matchQuery, strictSlash
// Now let's parse it.
defaultPattern := "[^/]+"
if matchQuery {
defaultPattern = "[^?&]+"
defaultPattern = "[^?&]*"
} else if matchHost {
defaultPattern = "[^.]+"
matchPrefix = false
@ -89,6 +89,9 @@ func newRouteRegexp(tpl string, matchHost, matchPrefix, matchQuery, strictSlash
if strictSlash {
pattern.WriteString("[/]?")
}
if matchQuery && len(idxs) == 0 {
pattern.WriteString(defaultPattern)
}
if !matchPrefix {
pattern.WriteByte('$')
}


Loading…
Cancel
Save