Setting DisableCompression to true to disable unwanted httpclient tranformations

pull/4164/head
tariqibrahim 7 years ago
parent 7571691e31
commit 2b171d6ed0

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

@ -27,10 +27,8 @@ func TestHTTPGetter(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if hg, ok := g.(*HttpGetter); !ok { if _, ok := g.(*HttpGetter); !ok {
t.Fatal("Expected newHTTPGetter to produce an HttpGetter") 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: // Test with SSL:

Loading…
Cancel
Save