From 88fdb47fb6a9d386a3df6730e4d1809da04ddb2b Mon Sep 17 00:00:00 2001
From: Zexi Li <lizexi@yunionyun.com>
Date: Fri, 9 Nov 2018 17:18:17 +0800
Subject: [PATCH] resolve confict

---
 pkg/proxy/http.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/proxy/http.go b/pkg/proxy/http.go
index 4d23731a0d..a554480dc0 100644
--- a/pkg/proxy/http.go
+++ b/pkg/proxy/http.go
@@ -50,10 +50,11 @@ func (p *SReverseProxy) ServeHTTP(ctx context.Context, w http.ResponseWriter, r
 	log.Debugf("Forwarding to servie: %q, url: %q", p.serviceName, remoteUrl.String())
 	proxy := httputil.NewSingleHostReverseProxy(remoteUrl)
 	proxy.Transport = &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		Proxy:             http.ProxyFromEnvironment,
+		TLSClientConfig:   &tls.Config{InsecureSkipVerify: true},
+		DisableKeepAlives: true,
 	}
 	r.Header.Del("Cookie")
 	r.Header.Del("X-Auth-Token")
 	proxy.ServeHTTP(w, r)
-	return
 }