From d73e99624d4a8b70afb3ceee8ece6007ba6de323 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Tue, 11 Apr 2017 15:35:58 +0700 Subject: [PATCH] drop support for Go 1.6 --- .travis.yml | 1 - README.md | 4 ---- h2quic/client.go | 2 +- h2quic/response_setuncompressed.go | 9 --------- h2quic/response_setuncompressed_go16.go | 9 --------- 5 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 h2quic/response_setuncompressed.go delete mode 100644 h2quic/response_setuncompressed_go16.go diff --git a/.travis.yml b/.travis.yml index b2af5eec7..9303f2ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ services: - docker go: - - 1.6.4 - 1.7.5 - 1.8 diff --git a/README.md b/README.md index fbfafcb92..1d43cc1c7 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,3 @@ http.Client{ Transport: &h2quic.QuicRoundTripper{}, } ``` - -## Building on Windows - -Due to the low Windows timer resolution (see [StackOverflow question](http://stackoverflow.com/questions/37706834/high-resolution-timers-millisecond-precision-in-go-on-windows)) available with Go 1.6.x, some optimizations might not work when compiled with this version of the compiler. Please use Go 1.7 on Windows. diff --git a/h2quic/client.go b/h2quic/client.go index 142ab1072..ca15e0c2e 100644 --- a/h2quic/client.go +++ b/h2quic/client.go @@ -239,7 +239,7 @@ func (c *Client) Do(req *http.Request) (*http.Response, error) { res.Header.Del("Content-Length") res.ContentLength = -1 res.Body = &gzipReader{body: res.Body} - setUncompressed(res) + res.Uncompressed = true } } diff --git a/h2quic/response_setuncompressed.go b/h2quic/response_setuncompressed.go deleted file mode 100644 index 191a24846..000000000 --- a/h2quic/response_setuncompressed.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build go1.7 - -package h2quic - -import "net/http" - -func setUncompressed(res *http.Response) { - res.Uncompressed = true -} diff --git a/h2quic/response_setuncompressed_go16.go b/h2quic/response_setuncompressed_go16.go deleted file mode 100644 index 7359f04a5..000000000 --- a/h2quic/response_setuncompressed_go16.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build !go1.7 - -package h2quic - -import "net/http" - -func setUncompressed(res *http.Response) { - // http.Response.Uncompressed was introduced in go 1.7 -}