fix panic error when vhost_http_port is not set but there is a http

proxy, fix #776
fatedier · May 17, 2018 · ad1e32f · ad1e32f
1 parent 3726f99
commit ad1e32f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/models/config/proxy.go b/models/config/proxy.go
@@ -509,7 +509,7 @@ func (cfg *HttpProxyConf) CheckForCli() (err error) {
 
 func (cfg *HttpProxyConf) CheckForSvr() (err error) {
 	if vhostHttpPort == 0 {
-		err = fmt.Errorf("type [http] not support when vhost_http_port is not set")
+		return fmt.Errorf("type [http] not support when vhost_http_port is not set")
 	}
 	if err = cfg.DomainConf.checkForSvr(); err != nil {
 		err = fmt.Errorf("proxy [%s] domain conf check error: %v", cfg.ProxyName, err)

diff --git a/utils/vhost/newhttp.go b/utils/vhost/newhttp.go
@@ -49,7 +49,6 @@ func getHostFromAddr(addr string) (host string) {
 
 type HttpReverseProxy struct {
 	proxy *ReverseProxy
-	tr    *http.Transport
 
 	vhostRouter *VhostRouters