Skip to content

Commit 5c2617e

Browse files
authored
fileserver: good default for precompressed (#6736)
1 parent 57ae9c3 commit 5c2617e

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

modules/caddyhttp/fileserver/caddyfile.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,13 @@ func (fsrv *FileServer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
146146
}
147147

148148
case "precompressed":
149-
var order []string
150-
for d.NextArg() {
151-
modID := "http.precompressed." + d.Val()
149+
fsrv.PrecompressedOrder = d.RemainingArgs()
150+
if len(fsrv.PrecompressedOrder) == 0 {
151+
fsrv.PrecompressedOrder = []string{"br", "zstd", "gzip"}
152+
}
153+
154+
for _, format := range fsrv.PrecompressedOrder {
155+
modID := "http.precompressed." + format
152156
mod, err := caddy.GetModule(modID)
153157
if err != nil {
154158
return d.Errf("getting module named '%s': %v", modID, err)
@@ -161,10 +165,8 @@ func (fsrv *FileServer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
161165
if fsrv.PrecompressedRaw == nil {
162166
fsrv.PrecompressedRaw = make(caddy.ModuleMap)
163167
}
164-
fsrv.PrecompressedRaw[d.Val()] = caddyconfig.JSON(precompress, nil)
165-
order = append(order, d.Val())
168+
fsrv.PrecompressedRaw[format] = caddyconfig.JSON(precompress, nil)
166169
}
167-
fsrv.PrecompressedOrder = order
168170

169171
case "status":
170172
if !d.NextArg() {

0 commit comments

Comments
 (0)