Browse Source
caddyhttp: Minor improved Caddyfile support for some matchers
Simply allows the matcher to be specified multiple times in a set
which may be more convenient than one long line.
master
Matthew Holt
5 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with
6 additions and
4 deletions
-
modules/caddyhttp/matchers.go
|
|
@ -135,7 +135,9 @@ func (MatchHost) CaddyModule() caddy.ModuleInfo { |
|
|
|
|
|
|
|
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
|
|
|
|
func (m *MatchHost) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { |
|
|
|
*m = d.RemainingArgs() |
|
|
|
for d.Next() { |
|
|
|
*m = append(*m, d.RemainingArgs()...) |
|
|
|
} |
|
|
|
return nil |
|
|
|
} |
|
|
|
|
|
|
@ -260,7 +262,7 @@ func (m MatchPath) Match(r *http.Request) bool { |
|
|
|
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
|
|
|
|
func (m *MatchPath) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { |
|
|
|
for d.Next() { |
|
|
|
*m = d.RemainingArgs() |
|
|
|
*m = append(*m, d.RemainingArgs()...) |
|
|
|
} |
|
|
|
return nil |
|
|
|
} |
|
|
@ -290,7 +292,7 @@ func (MatchMethod) CaddyModule() caddy.ModuleInfo { |
|
|
|
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
|
|
|
|
func (m *MatchMethod) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { |
|
|
|
for d.Next() { |
|
|
|
*m = d.RemainingArgs() |
|
|
|
*m = append(*m, d.RemainingArgs()...) |
|
|
|
} |
|
|
|
return nil |
|
|
|
} |
|
|
@ -622,7 +624,7 @@ func (MatchRemoteIP) CaddyModule() caddy.ModuleInfo { |
|
|
|
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
|
|
|
|
func (m *MatchRemoteIP) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { |
|
|
|
for d.Next() { |
|
|
|
m.Ranges = d.RemainingArgs() |
|
|
|
m.Ranges = append(m.Ranges, d.RemainingArgs()...) |
|
|
|
} |
|
|
|
return nil |
|
|
|
} |
|
|
|