serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-14 06:46:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

reverseproxy: Parse humanized byte size (fix #5095)

Browse source
This commit is contained in:
Matthew Holt 2022-09-29 12:37:06 -06:00
parent 037dc23cad
commit 2a8c458ffe
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/caddyhttp/reverseproxy/caddyfile.go
View file

@ -537,9 +537,9 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
if !d.NextArg() { if !d.NextArg() {
return d.ArgErr() return d.ArgErr()
} }
size, err := strconv.Atoi(d.Val()) size, err := humanize.ParseBytes(d.Val())
if err != nil { if err != nil {
return d.Errf("invalid size (bytes): %s", d.Val()) return d.Errf("invalid byte size '%s': %v", d.Val(), err)
} }
if d.NextArg() { if d.NextArg() {
return d.ArgErr() return d.ArgErr()

2
modules/caddyhttp/reverseproxy/reverseproxy.go
View file

@ -783,7 +783,7 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, origRe
rw.WriteHeader(code) rw.WriteHeader(code)
// Clear headers coming from the backend // Clear headers coming from the backend
// (it's not automatically done by ResponseWriter.WriteHeader() for 1xx responses) // (it's not automatically done by ResponseWriter.WriteHeader() for 1xx responses
for k := range header { for k := range header {
delete(h, k) delete(h, k)
} }