httpcaddyfile: Switch r. to re.

caddyserver · May 11, 2020 · ffc3b89 · ffc3b89
1 parent e0f1bad
commit ffc3b89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go
@@ -109,7 +109,7 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock,
 		{regexp.MustCompile(`{labels\.([\w-]*)}`), "{http.request.host.labels.$1}"},
 		{regexp.MustCompile(`{header\.([\w-]*)}`), "{http.request.header.$1}"},
 		{regexp.MustCompile(`{path\.([\w-]*)}`), "{http.request.uri.path.$1}"},
-		{regexp.MustCompile(`{r\.([\w-]*)\.([\w-]*)}`), "{http.regexp.$1.$2}"},
+		{regexp.MustCompile(`{re\.([\w-]*)\.([\w-]*)}`), "{http.regexp.$1.$2}"},
 	}
 
 	for _, sb := range originalServerBlocks {

diff --git a/caddytest/integration/caddyfile_adapt_test.go b/caddytest/integration/caddyfile_adapt_test.go
@@ -493,7 +493,7 @@ func TestGlobalOptions(t *testing.T) {
 func TestShorthandParameterizedPlaceholders(t *testing.T) {
 	caddytest.AssertAdapt(t, `
 	localhost:80
-	respond * "{header.content-type} {labels.0} {query.p} {path.0} {r.name.0}"
+	respond * "{header.content-type} {labels.0} {query.p} {path.0} {re.name.0}"
 	`, "caddyfile", `{
 	"apps": {
 		"http": {