diff --git a/mux_test.go b/mux_test.go index 9bed205..79d1651 100644 --- a/mux_test.go +++ b/mux_test.go @@ -606,6 +606,15 @@ func TestQueries(t *testing.T) { path: "", shouldMatch: false, }, + { + title: "Queries route with no parameter in request , should not match", + route: new(Route).Queries("foo", "{bar}"), + request: newRequest("GET", "http://localhost"), + vars: map[string]string{}, + host: "", + path: "", + shouldMatch: false, + }, } for _, test := range tests { diff --git a/regexp.go b/regexp.go index a1f6eb6..b300730 100644 --- a/regexp.go +++ b/regexp.go @@ -186,9 +186,13 @@ func (r *routeRegexp) getUrlQuery(req *http.Request) string { if !r.matchQuery { return "" } - key := strings.Split(r.template, "=")[0] - val := req.URL.Query().Get(key) - return key + "=" + val + templateKey := strings.Split(r.template, "=")[0] + for key, vals := range req.URL.Query() { + if key == templateKey && len(vals) > 0 { + return key + "=" + vals[0] + } + } + return "" } func (r *routeRegexp) matchQueryString(req *http.Request) bool {