From 732f2fa2c19394f938848c2b284e6b76c72a9e99 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sun, 27 Mar 2011 23:35:31 -0400 Subject: [PATCH] http: avoid crash when asked for multiple file ranges R=adg CC=golang-dev https://golang.org/cl/4289076 --- src/pkg/http/fs.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pkg/http/fs.go b/src/pkg/http/fs.go index 4ad680ccc3..8b5c4770c4 100644 --- a/src/pkg/http/fs.go +++ b/src/pkg/http/fs.go @@ -154,7 +154,10 @@ func serveFile(w ResponseWriter, r *Request, name string, redirect bool) { // handle Content-Range header. // TODO(adg): handle multiple ranges ranges, err := parseRange(r.Header.Get("Range"), size) - if err != nil || len(ranges) > 1 { + if err == nil && len(ranges) > 1 { + err = os.ErrorString("multiple ranges not supported") + } + if err != nil { Error(w, err.String(), StatusRequestedRangeNotSatisfiable) return } -- 2.50.0