github
/
frp
mirror of https://github.com/fatedier/frp
1
0
Fork 0
Code Issues Releases Wiki Activity

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

proxy, fix #776
pull/781/head
fatedier 2018-05-18 00:21:11 +08:00
parent 3726f99b04
commit ad1e32fd2d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/config/proxy.go
View File

@ -509,7 +509,7 @@ func (cfg *HttpProxyConf) CheckForCli() (err error) {
func (cfg *HttpProxyConf) CheckForSvr() (err error) { func (cfg *HttpProxyConf) CheckForSvr() (err error) {
if vhostHttpPort == 0 { 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 { if err = cfg.DomainConf.checkForSvr(); err != nil {
err = fmt.Errorf("proxy [%s] domain conf check error: %v", cfg.ProxyName, err) err = fmt.Errorf("proxy [%s] domain conf check error: %v", cfg.ProxyName, err)

1
utils/vhost/newhttp.go
View File

@ -49,7 +49,6 @@ func getHostFromAddr(addr string) (host string) {
type HttpReverseProxy struct { type HttpReverseProxy struct {
proxy *ReverseProxy proxy *ReverseProxy
tr *http.Transport
vhostRouter *VhostRouters vhostRouter *VhostRouters