serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-27 12:25:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

caddyhttp: Minor improved Caddyfile support for some matchers

Browse source 
Simply allows the matcher to be specified multiple times in a set
which may be more convenient than one long line.
This commit is contained in:
Matthew Holt 2020-03-18 23:36:25 -06:00
parent ce45353e61
commit afb2ca27c1
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/caddyhttp/matchers.go
View file

@ -135,7 +135,9 @@ func (MatchHost) CaddyModule() caddy.ModuleInfo {
// UnmarshalCaddyfile implements caddyfile.Unmarshaler. // UnmarshalCaddyfile implements caddyfile.Unmarshaler.
func (m *MatchHost) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { func (m *MatchHost) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
*m = d.RemainingArgs() for d.Next() {
*m = append(*m, d.RemainingArgs()...)
}
return nil return nil
} }
@ -260,7 +262,7 @@ func (m MatchPath) Match(r *http.Request) bool {
// UnmarshalCaddyfile implements caddyfile.Unmarshaler. // UnmarshalCaddyfile implements caddyfile.Unmarshaler.
func (m *MatchPath) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { func (m *MatchPath) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
for d.Next() { for d.Next() {
*m = d.RemainingArgs() *m = append(*m, d.RemainingArgs()...)
} }
return nil return nil
} }
@ -290,7 +292,7 @@ func (MatchMethod) CaddyModule() caddy.ModuleInfo {
// UnmarshalCaddyfile implements caddyfile.Unmarshaler. // UnmarshalCaddyfile implements caddyfile.Unmarshaler.
func (m *MatchMethod) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { func (m *MatchMethod) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
for d.Next() { for d.Next() {
*m = d.RemainingArgs() *m = append(*m, d.RemainingArgs()...)
} }
return nil return nil
} }
@ -622,7 +624,7 @@ func (MatchRemoteIP) CaddyModule() caddy.ModuleInfo {
// UnmarshalCaddyfile implements caddyfile.Unmarshaler. // UnmarshalCaddyfile implements caddyfile.Unmarshaler.
func (m *MatchRemoteIP) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { func (m *MatchRemoteIP) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
for d.Next() { for d.Next() {
m.Ranges = d.RemainingArgs() m.Ranges = append(m.Ranges, d.RemainingArgs()...)
} }
return nil return nil
} }