diff options
author | Francis Lavoie <[email protected]> | 2024-12-02 08:06:38 -0500 |
---|---|---|
committer | GitHub <[email protected]> | 2024-12-02 08:06:38 -0500 |
commit | b116dcea3d022cd2b060a978c499ac17e5d0a2e1 (patch) | |
tree | ac2be19ee8cff6e8cbb3f7d5a9d1b6772413e1d0 /caddyconfig/httpcaddyfile/shorthands.go | |
parent | 16d5b22349e7fe6aac876c2581df954578f595fd (diff) | |
download | caddy-b116dcea3d022cd2b060a978c499ac17e5d0a2e1.tar.gz caddy-b116dcea3d022cd2b060a978c499ac17e5d0a2e1.zip |
caddyhttp: Add `{?query}` placeholder (#6714)
* caddyhttp: Add `{prefixed_query}` placeholder
* fastcgi: Preserve query during canonical redirect
* Use orig_uri instead for the redirect, shorter Caddyfile shortcut
Diffstat (limited to 'caddyconfig/httpcaddyfile/shorthands.go')
-rw-r--r-- | caddyconfig/httpcaddyfile/shorthands.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/caddyconfig/httpcaddyfile/shorthands.go b/caddyconfig/httpcaddyfile/shorthands.go index 5d9ef31eb..ca6e4f92c 100644 --- a/caddyconfig/httpcaddyfile/shorthands.go +++ b/caddyconfig/httpcaddyfile/shorthands.go @@ -52,19 +52,27 @@ func NewShorthandReplacer() ShorthandReplacer { // be used in the Caddyfile, and the right is the replacement. func placeholderShorthands() []string { return []string{ - "{dir}", "{http.request.uri.path.dir}", - "{file}", "{http.request.uri.path.file}", "{host}", "{http.request.host}", "{hostport}", "{http.request.hostport}", "{port}", "{http.request.port}", + "{orig_method}", "{http.request.orig_method}", + "{orig_uri}", "{http.request.orig_uri}", + "{orig_path}", "{http.request.orig_uri.path}", + "{orig_dir}", "{http.request.orig_uri.path.dir}", + "{orig_file}", "{http.request.orig_uri.path.file}", + "{orig_query}", "{http.request.orig_uri.query}", + "{orig_?query}", "{http.request.orig_uri.prefixed_query}", "{method}", "{http.request.method}", + "{uri}", "{http.request.uri}", "{path}", "{http.request.uri.path}", + "{dir}", "{http.request.uri.path.dir}", + "{file}", "{http.request.uri.path.file}", "{query}", "{http.request.uri.query}", + "{?query}", "{http.request.uri.prefixed_query}", "{remote}", "{http.request.remote}", "{remote_host}", "{http.request.remote.host}", "{remote_port}", "{http.request.remote.port}", "{scheme}", "{http.request.scheme}", - "{uri}", "{http.request.uri}", "{uuid}", "{http.request.uuid}", "{tls_cipher}", "{http.request.tls.cipher_suite}", "{tls_version}", "{http.request.tls.version}", |