diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-05-19 02:13:36 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-05-19 03:51:11 +0000 |
| commit | 255e206b2bae9e7632043e08cf8cc0c7ce445c31 (patch) | |
| tree | da1ef5be81a3764104571e704ae28e72b59ff2ba /src/net/http/transfer.go | |
| parent | 8d428ed218d2b65dbb4abbd9be870c95439a2b14 (diff) | |
| download | go-255e206b2bae9e7632043e08cf8cc0c7ce445c31.tar.xz | |
net/http: update bundled http2
Updates x/net/http2 to git rev 5916dcb1 for:
* http2, lex/httplex: make Transport reject bogus headers before sending
https://golang.org/cl/23229
* http2: reject more trailer values
https://golang.org/cl/23230
Fixes #14048
Fixes #14188
Change-Id: Iaa8beca6e005267a3e849a10013eb424a882f2bb
Reviewed-on: https://go-review.googlesource.com/23234
Reviewed-by: Andrew Gerrand <adg@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/net/http/transfer.go')
| -rw-r--r-- | src/net/http/transfer.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/net/http/transfer.go b/src/net/http/transfer.go index 501e4be08c..b27ace638a 100644 --- a/src/net/http/transfer.go +++ b/src/net/http/transfer.go @@ -17,6 +17,8 @@ import ( "strconv" "strings" "sync" + + "golang.org/x/net/lex/httplex" ) // ErrLineTooLong is returned when reading request or response bodies @@ -561,9 +563,9 @@ func shouldClose(major, minor int, header Header, removeCloseHeader bool) bool { } conv := header["Connection"] - hasClose := headerValuesContainsToken(conv, "close") + hasClose := httplex.HeaderValuesContainsToken(conv, "close") if major == 1 && minor == 0 { - return hasClose || !headerValuesContainsToken(conv, "keep-alive") + return hasClose || !httplex.HeaderValuesContainsToken(conv, "keep-alive") } if hasClose && removeCloseHeader { |