From 67d32e6779b8e4f67fb0902b06210596371ead7f Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 21 May 2019 13:10:14 -0600 Subject: Fix up matchers tests and take care of TODO in rewrite --- modules/caddyhttp/replacer.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/caddyhttp/replacer.go') 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 { -- cgit v1.2.3