mirrors/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-16 10:51:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix the problem of long connection for more than 30 seconds and disconnection of the server

Browse Source
This commit is contained in:
itcode
2018-08-08 10:52:08 +08:00
parent 629f2856b1
commit 9bb08396c7
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
models/config/server_common.go
View File

@ -73,6 +73,7 @@ type ServerCommonConf struct {
MaxPortsPerClient int64 `json:"max_ports_per_client"`
HeartBeatTimeout int64 `json:"heart_beat_timeout"`
UserConnTimeout int64 `json:"user_conn_timeout"`
VhostHttpTimeout int64 `json:"vhost_http_timeout "`
}
func GetDefaultServerConf() *ServerCommonConf {
@ -102,6 +103,7 @@ func GetDefaultServerConf() *ServerCommonConf {
MaxPortsPerClient: 0,
HeartBeatTimeout: 90,
UserConnTimeout: 10,
VhostHttpTimeout: 30,
}
}
@ -300,6 +302,15 @@ func UnmarshalServerConfFromIni(defaultCfg *ServerCommonConf, content string) (c
cfg.HeartBeatTimeout = v
}
}
if tmpStr, ok = conf.Get("common", "vhost_http_timeout"); ok {
v, errRet := strconv.ParseInt(tmpStr, 10, 64)
if errRet != nil {
err = fmt.Errorf("Parse conf error: vhost_http_timeout is incorrect")
return
} else {
cfg.VhostHttpTimeout = v
}
}
return
}