github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 20:24:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

httpcaddyfile: Add {remote} shorthand placeholders

Browse Source 
Also sort the list
This commit is contained in:
Matthew Holt 2020-02-04 13:31:22 -07:00
parent 490cd02f82
commit c0f827e0bd
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
caddyconfig/httpcaddyfile/httptype.go
View File

@ -94,15 +94,18 @@ func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock,
// their actual placeholder identifiers or // their actual placeholder identifiers or
// variable names // variable names
replacer := strings.NewReplacer( replacer := strings.NewReplacer(
"{uri}", "{http.request.uri}", "{dir}", "{http.request.uri.path.dir}",
"{path}", "{http.request.uri.path}", "{file}", "{http.request.uri.path.file}",
"{host}", "{http.request.host}", "{host}", "{http.request.host}",
"{hostport}", "{http.request.hostport}", "{hostport}", "{http.request.hostport}",
"{method}", "{http.request.method}", "{method}", "{http.request.method}",
"{scheme}", "{http.request.scheme}", "{path}", "{http.request.uri.path}",
"{file}", "{http.request.uri.path.file}",
"{dir}", "{http.request.uri.path.dir}",
"{query}", "{http.request.uri.query}", "{query}", "{http.request.uri.query}",
"{remote_host}", "{http.request.remote.host}",
"{remote_port}", "{http.request.remote.port}",
"{remote}", "{http.request.remote}",
"{scheme}", "{http.request.scheme}",
"{uri}", "{http.request.uri}",
) )
for _, segment := range sb.block.Segments { for _, segment := range sb.block.Segments {
for i := 0; i < len(segment); i++ { for i := 0; i < len(segment); i++ {