Merge 2b171d6ed0 into 7571691e31

pkg/getter/httpgetter.go

@@ -81,19 +81,17 @@ func newHTTPGetter(URL, CertFile, KeyFile, CAFile string) (Getter, error) {
 // NewHTTPGetter constructs a valid http/https client as HttpGetter
 func NewHTTPGetter(URL, CertFile, KeyFile, CAFile string) (*HttpGetter, error) {
 	var client HttpGetter
+	tr := &http.Transport{
+		DisableCompression: true,
+	}
 	if (CertFile != "" && KeyFile != "") || CAFile != "" {
 		tlsConf, err := tlsutil.NewTLSConfig(URL, CertFile, KeyFile, CAFile)
 		if err != nil {
 			return &client, fmt.Errorf("can't create TLS config: %s", err.Error())
 		}
-		client.client = &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: tlsConf,
-				Proxy:           http.ProxyFromEnvironment,
-			},
-		}
-	} else {
-		client.client = http.DefaultClient
+		tr.TLSClientConfig = tlsConf
+		tr.Proxy = http.ProxyFromEnvironment
 	}
+	client.client = &http.Client{Transport: tr}
 	return &client, nil
 }

pkg/getter/httpgetter_test.go

@@ -27,10 +27,8 @@ func TestHTTPGetter(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if hg, ok := g.(*HttpGetter); !ok {
+	if _, ok := g.(*HttpGetter); !ok {
 		t.Fatal("Expected newHTTPGetter to produce an HttpGetter")
-	} else if hg.client != http.DefaultClient {
-		t.Fatal("Expected newHTTPGetter to return a default HTTP client.")
 	}
 
 	// Test with SSL: