Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 13, 13:00 UTC
httpcaddyfile: Add a couple more placeholder shortcuts (#5015)
This adds: - `{file.*}` -> `{http.request.uri.path.file.*}` - `{file_match.*}` -> `{http.matchers.file.*}` This is a follow-up to #4993 which introduces the new URI file placeholders, and a shortcut for using `file` matcher output. For example, where the `try_files` directive is a shortcut for this: ``` @try_files file <files...> rewrite @try_files {http.matchers.file.relative} ``` It could instead be: ``` @try_files file <files...> rewrite @try_files {file_match.relative} ```
Francis Lavoie committed
Sep 5, 2022 at 23:41 UTC
8cc8f9fddd2ea717633528322e1bef938bee2415
1 file changed
+2
caddyconfig/httpcaddyfile/httptype.go
+2
@@ -95,11 +95,13 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock,
95
{regexp.MustCompile(`{cookie\.([\w-]*)}`), "{http.request.cookie.$1}"},
96
{regexp.MustCompile(`{labels\.([\w-]*)}`), "{http.request.host.labels.$1}"},
97
{regexp.MustCompile(`{path\.([\w-]*)}`), "{http.request.uri.path.$1}"},
98
+ {regexp.MustCompile(`{file\.([\w-]*)}`), "{http.request.uri.path.file.$1}"},
99
{regexp.MustCompile(`{query\.([\w-]*)}`), "{http.request.uri.query.$1}"},
100
{regexp.MustCompile(`{re\.([\w-]*)\.([\w-]*)}`), "{http.regexp.$1.$2}"},
101
{regexp.MustCompile(`{vars\.([\w-]*)}`), "{http.vars.$1}"},
102
{regexp.MustCompile(`{rp\.([\w-\.]*)}`), "{http.reverse_proxy.$1}"},
103
{regexp.MustCompile(`{err\.([\w-\.]*)}`), "{http.error.$1}"},
104
+ {regexp.MustCompile(`{file_match\.([\w-]*)}`), "{http.matchers.file.$1}"},
105
}
106
107
for _, sb := range originalServerBlocks {