diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2018-05-07 19:09:16 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2018-05-07 20:20:49 +0000 |
| commit | 8e9386db0ee72ffa847b1673d15f6092291724d9 (patch) | |
| tree | 52f53ab481a957dd794b52b4aab47fe11d70e393 /src/net/http/http.go | |
| parent | 9b16b9c7f95562bb290f5015324a345be855894d (diff) | |
| download | go-8e9386db0ee72ffa847b1673d15f6092291724d9.tar.xz | |
vendor, net/http: update x/net for httplex to httpguts merge
Updates x/net to git rev cbb82b59bc for:
lex/httplex, http/httpguts: merge the httplex package into httpguts
https://golang.org/cl/111875
http2: set nextStreamID to 3 when AllowHTTP is set
https://golang.org/cl/111835
http2: terminate await request cancel goroutine on conn close
https://golang.org/cl/108415
Fixes #24776 (CL 111655 didn't actually include it)
Change-Id: I0a21e169ebba2ec35219f347f1e31cd4c67bebdf
Reviewed-on: https://go-review.googlesource.com/111876
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Kunpei Sakai <namusyaka@gmail.com>
Reviewed-by: Andrew Bonventre <andybons@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/net/http/http.go')
| -rw-r--r-- | src/net/http/http.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/http/http.go b/src/net/http/http.go index b95ca89f40..ce0eceb1de 100644 --- a/src/net/http/http.go +++ b/src/net/http/http.go @@ -11,7 +11,7 @@ import ( "time" "unicode/utf8" - "golang_org/x/net/lex/httplex" + "golang_org/x/net/http/httpguts" ) // maxInt64 is the effective "infinite" value for the Server and @@ -47,7 +47,7 @@ func removeEmptyPort(host string) string { } func isNotToken(r rune) bool { - return !httplex.IsTokenRune(r) + return !httpguts.IsTokenRune(r) } func isASCII(s string) bool { |