From e19af0f1447e0f99688949c68cd8c39d188f699c Mon Sep 17 00:00:00 2001 From: Marcus Weiner Date: Wed, 24 Jun 2020 15:24:56 +0000 Subject: [release-branch.go1.13] net/http: fix panic with If-None-Match value in http.ServeContent Updates #39817. Fixes #39925. Change-Id: I79f2ad7c836a8a46569f603aca583fdd526d22dc GitHub-Last-Rev: 5b88aada219aaa2af0c7e1969ed6fa646117d9da GitHub-Pull-Request: golang/go#39821 Reviewed-on: https://go-review.googlesource.com/c/go/+/239699 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick (cherry picked from commit ce81a8f5e4f6c33036aa0777fabc47eeeab468dc) Reviewed-on: https://go-review.googlesource.com/c/go/+/242077 Run-TryBot: Dmitri Shuralyov Reviewed-by: Marcus Weiner Reviewed-by: Emmanuel Odeke --- src/net/http/fs.go | 1 + src/net/http/fs_test.go | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/net/http/fs.go b/src/net/http/fs.go index 41d46dced2..ac4ed23e71 100644 --- a/src/net/http/fs.go +++ b/src/net/http/fs.go @@ -408,6 +408,7 @@ func checkIfNoneMatch(w ResponseWriter, r *Request) condResult { } if buf[0] == ',' { buf = buf[1:] + continue } if buf[0] == '*' { return condFalse diff --git a/src/net/http/fs_test.go b/src/net/http/fs_test.go index 762e88b05f..f3c240fe7e 100644 --- a/src/net/http/fs_test.go +++ b/src/net/http/fs_test.go @@ -837,6 +837,15 @@ func TestServeContent(t *testing.T) { wantStatus: 200, wantContentType: "text/css; charset=utf-8", }, + "if_none_match_malformed": { + file: "testdata/style.css", + serveETag: `"foo"`, + reqHeader: map[string]string{ + "If-None-Match": `,`, + }, + wantStatus: 200, + wantContentType: "text/css; charset=utf-8", + }, "range_good": { file: "testdata/style.css", serveETag: `"A"`, -- cgit v1.2.3-54-g00ecf