Move file_limit inside browse.

This commit is contained in:
Atakan Yenel 2024-10-22 16:59:10 +00:00 committed by Atakan Yenel
parent ed0d6877a7
commit 3aa4d56c76

View File

@ -59,7 +59,6 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
// browse [<template_file>]
// precompressed <formats...>
// status <status>
// file_limit <limit>
// disable_canonical_uris
// }
//
@ -131,6 +130,16 @@ func (fsrv *FileServer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
return d.Errf("unknown sort option '%s'", dVal)
}
}
case "file_limit":
fileLimit := d.RemainingArgs()
if len(fileLimit) != 1 {
return d.Err("file_limit should have an integer value")
}
val, _ := strconv.Atoi(fileLimit[0])
if fsrv.Browse.FileLimit != 0 {
return d.Err("file_limit is already enabled")
}
fsrv.Browse.FileLimit = val
default:
return d.Errf("unknown subdirective '%s'", d.Val())
}
@ -170,17 +179,6 @@ func (fsrv *FileServer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
falseBool := false
fsrv.CanonicalURIs = &falseBool
case "file_limit":
fileLimit := d.RemainingArgs()
if len(fileLimit) != 1 {
return d.Err("file_limit should have an integer value")
}
val, _ := strconv.Atoi(fileLimit[0])
if fsrv.Browse.FileLimit != 0 {
return d.Err("file_limit is already enabled")
}
fsrv.Browse.FileLimit = val
case "pass_thru":
if d.NextArg() {
return d.ArgErr()