fileserver: Fix Caddyfile parsing

mholt · mholt · commit 350ad38f63f7 · 2024-10-31T10:37:37.000-06:00
Reported at mholt/caddy-sqlite-fs#3
diff --git a/modules/caddyhttp/fileserver/caddyfile.go b/modules/caddyhttp/fileserver/caddyfile.go
@@ -78,7 +78,7 @@ func (fsrv *FileServer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 		return d.ArgErr()
 	}
 
-	for d.NextBlock(0) {
+	for nesting := d.Nesting(); d.NextBlock(nesting); {
 		switch d.Val() {
 		case "fs":
 			if !d.NextArg() {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (fsrv FileServer) UnmarshalCaddyfile(d caddyfile.Dispenser) error {`
`78`	`78`	`return d.ArgErr()`
`79`	`79`	`}`
`80`	`80`
`81`		`- for d.NextBlock(0) {`
	`81`	`+ for nesting := d.Nesting(); d.NextBlock(nesting); {`
`82`	`82`	`switch d.Val() {`
`83`	`83`	`case "fs":`
`84`	`84`	`if !d.NextArg() {`