Merge pull request #38 from fatedier/fatedier/fix_vhost_bug

cmd/frps: fix a bug when vhost_http_port is not set, fix #30
This commit is contained in:
fatedier 2016-06-24 14:00:50 +08:00 committed by GitHub
commit ef5702213f

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