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

Add query_string to HTTP replacer and use it for try_files

Browse source
This commit is contained in:
Matthew Holt 2019-08-27 14:38:24 -06:00
parent 2dc4fcc62b
commit d242f10eda
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/caddyhttp/fileserver/caddyfile.go
View file

@ -17,9 +17,9 @@ package fileserver
import (
"encoding/json"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
)
func init() {
@ -99,7 +99,7 @@ func parseTryFiles(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error)
}
handler := rewrite.Rewrite{
URI: "{http.matchers.file.relative}{http.request.uri.query}",
URI: "{http.matchers.file.relative}{http.request.uri.query_string}",
}
matcherSet := map[string]json.RawMessage{

6
modules/caddyhttp/replacer.go
View file

@ -89,6 +89,12 @@ func addHTTPVarsToReplacer(repl caddy.Replacer, req *http.Request, w http.Respon
return dir, true
case "http.request.uri.query":
return req.URL.RawQuery, true
case "http.request.uri.query_string":
qs := req.URL.Query().Encode()
if qs != "" {
qs = "?" + qs
}
return qs, true
}
// hostname labels