@marcel91200 / caddy Mirror · read-only / commits / 5c2617eb
Fork 0

Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS

Mirrored from https://github.com/Slazee/caddy.git

Synced Nov 12, 05:45 UTC

fileserver: good default for precompressed (#6736)

Kévin Dunglas committed Dec 10, 2024 at 16:31 UTC 5c2617ebf9303100fc8c6be2a80b966b2c7fb7f1
1 file changed +8 -6
modules/caddyhttp/fileserver/caddyfile.go
+8 -6
@@ -146,9 +146,13 @@ func (fsrv *FileServer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
146 }
147
148 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
156 mod, err := caddy.GetModule(modID)
157 if err != nil {
158 return d.Errf("getting module named '%s': %v", modID, err)
@@ -161,10 +165,8 @@ func (fsrv *FileServer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
165 if fsrv.PrecompressedRaw == nil {
166 fsrv.PrecompressedRaw = make(caddy.ModuleMap)
167 }
164 - fsrv.PrecompressedRaw[d.Val()] = caddyconfig.JSON(precompress, nil)
165 - order = append(order, d.Val())
168 + fsrv.PrecompressedRaw[format] = caddyconfig.JSON(precompress, nil)
169 }
167 - fsrv.PrecompressedOrder = order
170
171 case "status":
172 if !d.NextArg() {