CERBERUS/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-08-27 04:07:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

caddyfile: Refactor; NewFromNextSegment(); fix repeated matchers

Browse source 
Now multiple instances of the same matcher can be used within a named
matcher without overwriting previous ones.
This commit is contained in:
Matthew Holt 2020-02-14 11:00:16 -07:00
parent eb80165583
commit 15bf9c196c
8 changed files with 76 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/caddyhttp/encode/caddyfile.go
View file

@ -73,7 +73,7 @@ func (enc *Encode) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
if !ok {
return fmt.Errorf("encoder module '%s' is not a Caddyfile unmarshaler", mod)
}
err = unm.UnmarshalCaddyfile(d.NewFromNextTokens())
err = unm.UnmarshalCaddyfile(d.NewFromNextSegment())
if err != nil {
return err
}