serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 06:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

http: query and query_string placeholders should use RawQuery, probably

Browse source
This commit is contained in:
Matthew Holt 2019-12-17 16:29:37 -07:00
parent fe516575db
commit 21408212da
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/caddyhttp/replacer.go
View file

@ -105,7 +105,7 @@ func addHTTPVarsToReplacer(repl caddy.Replacer, req *http.Request, w http.Respon
case "http.request.uri.query": case "http.request.uri.query":
return req.URL.RawQuery, true return req.URL.RawQuery, true
case "http.request.uri.query_string": case "http.request.uri.query_string":
return "?" + req.URL.Query().Encode(), true return "?" + req.URL.RawQuery, true
// original request, before any internal changes // original request, before any internal changes
case "http.request.orig_method": 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 return or.URL.RawQuery, true
case "http.request.orig_uri.query_string": case "http.request.orig_uri.query_string":
or, _ := req.Context().Value(OriginalRequestCtxKey).(http.Request) or, _ := req.Context().Value(OriginalRequestCtxKey).(http.Request)
qs := or.URL.Query().Encode() return "?" + or.URL.RawQuery, true
if qs != "" {
qs = "?" + qs
}
return qs, true
} }
// hostname labels // hostname labels