updates for golang 1.5

dropwhile · dropwhile · commit 14eecc928bcb · 2015-08-27T20:35:55.000-07:00
It seems[1] go http.Client errors changed a bit for go 1.5. [1]: golang/go#9405
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ VERSION_VAR       := main.ServerVersion
 GOTEST_FLAGS      := -cpu=1,2
 GOBUILD_DEPFLAGS  := -tags netgo
 GOBUILD_LDFLAGS   ?=
-GOBUILD_FLAGS     := ${GOBUILD_DEPFLAGS} -ldflags "${GOBUILD_LDFLAGS} -X ${VERSION_VAR} ${GOCAMO_VER}"
+GOBUILD_FLAGS     := ${GOBUILD_DEPFLAGS} -ldflags "${GOBUILD_LDFLAGS} -X ${VERSION_VAR}=${GOCAMO_VER}"
 GO                := env GOPATH="${GOPATH}" go
 XCOMPILE_ARCHES   := darwin.amd64 freebsd.amd64 linux.amd64
 
diff --git a/camo/proxy.go b/camo/proxy.go
@@ -157,7 +157,7 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		// still having to rely on string comparison to find out if it is
 		// a net.errClosing or not.
 		errString := err.Error()
-		if strings.Contains(errString, "timeout") {
+		if strings.Contains(errString, "timeout") || strings.Contains(errString, "Client.Timeout") {
 			http.Error(w, "Error Fetching Resource", http.StatusGatewayTimeout)
 		} else if strings.Contains(errString, "use of closed") {
 			http.Error(w, "Error Fetching Resource", http.StatusBadGateway)
diff --git a/camo/proxy_test.go b/camo/proxy_test.go
@@ -243,7 +243,7 @@ func TestTimeout(t *testing.T) {
 
 	errc := make(chan error, 1)
 	go func() {
-		_, err := processRequest(req, 502, c)
+		_, err := processRequest(req, 504, c)
 		errc <- err
 	}()
 
