summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2019-12-17 16:29:37 -0700
committerMatthew Holt <[email protected]>2019-12-17 16:29:37 -0700
commit21408212dafc1b37e2f2d51a4c4afbcc9cef403b (patch)
treef9595b064feb6b6d40d5fde194df958a1d708ef5
parentfe516575db3da5c0b9eba74b07066ecc22d90ba4 (diff)
downloadcaddy-21408212dafc1b37e2f2d51a4c4afbcc9cef403b.tar.gz
caddy-21408212dafc1b37e2f2d51a4c4afbcc9cef403b.zip
http: query and query_string placeholders should use RawQuery, probably
-rw-r--r--modules/caddyhttp/replacer.go8
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go
index b806fdc9e..c8fae796e 100644
--- a/modules/caddyhttp/replacer.go
+++ b/modules/caddyhttp/replacer.go
@@ -105,7 +105,7 @@ func addHTTPVarsToReplacer(repl caddy.Replacer, req *http.Request, w http.Respon
case "http.request.uri.query":
return req.URL.RawQuery, true
case "http.request.uri.query_string":
- return "?" + req.URL.Query().Encode(), true
+ return "?" + req.URL.RawQuery, true
// original request, before any internal changes
case "http.request.orig_method":
@@ -130,11 +130,7 @@ func addHTTPVarsToReplacer(repl caddy.Replacer, req *http.Request, w http.Respon
return or.URL.RawQuery, true
case "http.request.orig_uri.query_string":
or, _ := req.Context().Value(OriginalRequestCtxKey).(http.Request)
- qs := or.URL.Query().Encode()
- if qs != "" {
- qs = "?" + qs
- }
- return qs, true
+ return "?" + or.URL.RawQuery, true
}
// hostname labels