Go 1.10.2 -> 1.10.3. Remove support for Go < 1.7.

.travis.yml

@@ -5,14 +5,14 @@ language: go
 
 matrix:
   include:
-  - go: 1.6.4
-    env: VIPS_VERSION=8.4.6
   - go: 1.7.6
     env: VIPS_VERSION=8.4.6
   - go: 1.8.7
     env: VIPS_VERSION=8.5.9
-  - go: 1.9.4
+  - go: 1.9.7
     env: VIPS_VERSION=8.5.9
+  - go: 1.10.3
+    env: VIPS_VERSION=8.5.9 GOLINT=true
 
 before_install:
   - rm -rf $GOPATH/{bin,pkg}/*

cmd/fotomat/version.go

@@ -8,7 +8,7 @@ import (
 
 const (
 	// FotomatVersion is updated by git-hooks/pre-commit
-	FotomatVersion = "2.8.231"
+	FotomatVersion = "2.8.232"
 )
 
 var (

preinstall.sh

@@ -8,7 +8,7 @@ set -euo pipefail
 # Usage: sudo ./preinstall.sh
 
 VIPS_VERSION=${VIPS_VERSION:-8.5.9}
-GO_VERSION=${GO_VERSION:-1.10.2}
+GO_VERSION=${GO_VERSION:-1.10.3}
 
 export PATH="/usr/local/bin:/usr/bin:/bin:${PATH:-}"
 export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:${PKG_CONFIG_PATH:-}"

thumbnail/proxy.go

@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 )
@@ -211,17 +210,8 @@ func isTimeout(err error) bool {
 	if err == nil {
 		return false
 	}
-	switch err := err.(type) {
-	case net.Error:
+	if err, ok := err.(net.Error); ok {
 		return err.Timeout()
-	case *url.Error:
-		// Only necessary for Go < 1.6.
-		if err, ok := err.Err.(net.Error); ok {
-			return err.Timeout()
-		}
-		if err.Err.Error() == "net/http: request canceled while waiting for connection" {
-			return true
-		}
 	}
 	return false
 }

thumbnail/proxy_test.go

@@ -55,6 +55,14 @@ func TestProxyErrors(t *testing.T) {
 	assert.Nil(t, NewProxy(nil, nil, 0, nil))
 }
 
+func TestProxyTimeout(t *testing.T) {
+	ps := newProxyServer(time.Second, time.Nanosecond)
+	defer ps.close()
+
+	body, status := ps.get("timeout")
+	assert.Equal(t, http.StatusGatewayTimeout, status, string(body))
+}
+
 type proxyServer struct {
 	proxy   *Proxy
 	server  *httptest.Server