diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2022-03-18 17:08:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 15:08:23 -0600 |
| commit | c5fffb4ac2631f0b41a8e13b62925b9dc8346cb9 (patch) | |
| tree | c63bee8e93dd3b7b7544e18602a8606c3a38570d /modules/caddyhttp/celmatcher.go | |
| parent | dc4d147388547515f77447d594024386b732e7d4 (diff) | |
caddyfile: Support for raw token values; improve `map`, `expression` (#4643)
* caddyfile: Support for raw token values, improve `map`, `expression`
* Applied code review comments
* Rename RawVal to ValRaw
Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>
Diffstat (limited to 'modules/caddyhttp/celmatcher.go')
| -rw-r--r-- | modules/caddyhttp/celmatcher.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/caddyhttp/celmatcher.go b/modules/caddyhttp/celmatcher.go index d7d55d8..0306f39 100644 --- a/modules/caddyhttp/celmatcher.go +++ b/modules/caddyhttp/celmatcher.go @@ -150,7 +150,11 @@ func (m MatchExpression) Match(r *http.Request) bool { // UnmarshalCaddyfile implements caddyfile.Unmarshaler. func (m *MatchExpression) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { for d.Next() { - m.Expr = strings.Join(d.RemainingArgs(), " ") + if d.CountRemainingArgs() > 1 { + m.Expr = strings.Join(d.RemainingArgsRaw(), " ") + } else { + m.Expr = d.Val() + } } return nil } |