From: Russ Cox <rsc@golang.org>
Date: Mon, 28 Mar 2011 03:35:31 +0000 (-0400)
Subject: http: avoid crash when asked for multiple file ranges
X-Git-Tag: weekly.2011-03-28~12
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=732f2fa2c19394f938848c2b284e6b76c72a9e99;p=gostls13.git

http: avoid crash when asked for multiple file ranges

R=adg
CC=golang-dev
https://golang.org/cl/4289076
---

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
 	}