drop Go versions prior to 1.7 in CI

* drop Go versions prior to 1.7 in CI * consolidate conn*.go files after dropping old Go support
gorilla · Aug 22, 2018 · 5fb9417 · 5fb9417
1 parent 3ff3320
commit 5fb9417
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,6 @@ sudo: false
 
 matrix:
   include:
-    - go: 1.4
-    - go: 1.5.x
-    - go: 1.6.x
     - go: 1.7.x
     - go: 1.8.x
     - go: 1.9.x

diff --git a/conn.go b/conn.go
@@ -370,6 +370,15 @@ func (c *Conn) writeFatal(err error) error {
 	return err
 }
 
+func (c *Conn) read(n int) ([]byte, error) {
+	p, err := c.br.Peek(n)
+	if err == io.EOF {
+		err = errUnexpectedEOF
+	}
+	c.br.Discard(len(p))
+	return p, err
+}
+
 func (c *Conn) write(frameType int, deadline time.Time, buf0, buf1 []byte) error {
 	<-c.mu
 	defer func() { c.mu <- true }()

diff --git a/conn_read.go b/conn_read.go
diff --git a/conn_read_legacy.go b/conn_read_legacy.go