Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
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.
Matthew Holt committed
Mar 18, 2020 at 23:36 UTC
afb2ca27c1b5464778c2e2c4ebf6f66337f98b30
1 file changed
+6
-4
modules/caddyhttp/matchers.go
+6
-4
@@ -135,7 +135,9 @@ func (MatchHost) CaddyModule() caddy.ModuleInfo {
135
136
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
137
func (m *MatchHost) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
138
- *m = d.RemainingArgs()
138
+ for d.Next() {
139
+ *m = append(*m, d.RemainingArgs()...)
140
+ }
141
return nil
142
}
143
@@ -260,7 +262,7 @@ func (m MatchPath) Match(r *http.Request) bool {
262
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
263
func (m *MatchPath) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
264
for d.Next() {
263
- *m = d.RemainingArgs()
265
+ *m = append(*m, d.RemainingArgs()...)
266
}
267
return nil
268
}
@@ -290,7 +292,7 @@ func (MatchMethod) CaddyModule() caddy.ModuleInfo {
292
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
293
func (m *MatchMethod) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
294
for d.Next() {
293
- *m = d.RemainingArgs()
295
+ *m = append(*m, d.RemainingArgs()...)
296
}
297
return nil
298
}
@@ -622,7 +624,7 @@ func (MatchRemoteIP) CaddyModule() caddy.ModuleInfo {
624
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
625
func (m *MatchRemoteIP) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
626
for d.Next() {
625
- m.Ranges = d.RemainingArgs()
627
+ m.Ranges = append(m.Ranges, d.RemainingArgs()...)
628
}
629
return nil
630
}