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

Merge pull request #38 from fatedier/fatedier/fix_vhost_bug 

cmd/frps: fix a bug when vhost_http_port is not set, fix #30
pull/40/head
fatedier 2016-06-24 14:00:50 +08:00 committed by GitHub
parent c5e4b24f8f 817f4463f4
commit ef5702213f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frp/cmd/frps/control.go
View File

@ -224,6 +224,13 @@ func doLogin(req *msg.ControlReq, c *conn.Conn) (ret int64, info string) {
return return
} }
// check if vhost_port is set
if s.Type == "http" && server.VhostMuxer == nil {
info = fmt.Sprintf("ProxyName [%s], type [http] not support when vhost_http_port is not set", req.ProxyName)
log.Warn(info)
return
}
// set infomations from frpc // set infomations from frpc
s.UseEncryption = req.UseEncryption s.UseEncryption = req.UseEncryption
s.UseGzip = req.UseGzip s.UseGzip = req.UseGzip