Fix up matchers tests and take care of TODO in rewrite

1 files changed, 4 insertions, 3 deletions

diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go
index 16cc1fe..0b0547d 100644
--- a/modules/caddyhttp/replacer.go
+++ b/modules/caddyhttp/replacer.go
@@ -48,16 +48,17 @@ func addHTTPVarsToReplacer(repl caddy2.Replacer, req *http.Request, w http.Respo
 				dir, _ := path.Split(req.URL.Path)
 				return dir
 			}()
+			m["http.request.uri.query"] = req.URL.RawQuery
 
+			for param, vals := range req.URL.Query() {
+				m["http.request.uri.query."+param] = strings.Join(vals, ",")
+			}
 			for field, vals := range req.Header {
 				m["http.request.header."+strings.ToLower(field)] = strings.Join(vals, ",")
 			}
 			for _, cookie := range req.Cookies() {
 				m["http.request.cookie."+cookie.Name] = cookie.Value
 			}
-			for param, vals := range req.URL.Query() {
-				m["http.request.uri.query."+param] = strings.Join(vals, ",")
-			}
 
 			hostLabels := strings.Split(req.Host, ".")
 			for i, label := range hostLabels {