From a522be2e12bb769457af8df71a09aa9a3e3c25fe Mon Sep 17 00:00:00 2001 From: itcode <235832289@qq.com> Date: Tue, 7 Aug 2018 11:02:58 +0800 Subject: [PATCH] Change the name from "ResponseHeaderTimeout " to "vhost_http_timeout" and Use lowercase letter at the beginning --- cmd/frps/root.go | 52 ++++++++++++------------- conf/frps_full.ini | 4 +- models/config/server_common.go | 70 +++++++++++++++++----------------- utils/vhost/newhttp.go | 2 +- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/cmd/frps/root.go b/cmd/frps/root.go index b0c91b91..8afc3da4 100644 --- a/cmd/frps/root.go +++ b/cmd/frps/root.go @@ -37,30 +37,30 @@ var ( cfgFile string showVersion bool - bindAddr string - bindPort int - bindUdpPort int - kcpBindPort int - proxyBindAddr string - vhostHttpPort int - vhostHttpsPort int - dashboardAddr string - dashboardPort int - dashboardUser string - dashboardPwd string - assetsDir string - logFile string - logWay string - logLevel string - logMaxDays int64 - token string - authTimeout int64 - subDomainHost string - tcpMux bool - allowPorts string - maxPoolCount int64 - maxPortsPerClient int64 - ResponseHeaderTimeout int64 + bindAddr string + bindPort int + bindUdpPort int + kcpBindPort int + proxyBindAddr string + vhostHttpPort int + vhostHttpsPort int + dashboardAddr string + dashboardPort int + dashboardUser string + dashboardPwd string + assetsDir string + logFile string + logWay string + logLevel string + logMaxDays int64 + token string + authTimeout int64 + subDomainHost string + tcpMux bool + allowPorts string + maxPoolCount int64 + maxPortsPerClient int64 + vhostHttpTimeout int64 ) func init() { @@ -86,7 +86,7 @@ func init() { rootCmd.PersistentFlags().Int64VarP(&authTimeout, "auth_timeout", "", 900, "auth timeout") rootCmd.PersistentFlags().StringVarP(&subDomainHost, "subdomain_host", "", "", "subdomain host") rootCmd.PersistentFlags().Int64VarP(&maxPortsPerClient, "max_ports_per_client", "", 0, "max ports per client") - rootCmd.PersistentFlags().Int64VarP(&ResponseHeaderTimeout, "Response_Header_Timeout", "", 30, "Response Header Timeout") + rootCmd.PersistentFlags().Int64VarP(&vhostHttpTimeout, "vhost_http_timeout", "", 30, "vhost http timeout") } var rootCmd = &cobra.Command{ @@ -179,7 +179,7 @@ func parseServerCommonCfgFromCmd() (err error) { g.GlbServerCfg.AuthTimeout = authTimeout g.GlbServerCfg.SubDomainHost = subDomainHost g.GlbServerCfg.MaxPortsPerClient = maxPortsPerClient - g.GlbServerCfg.ResponseHeaderTimeout = ResponseHeaderTimeout + g.GlbServerCfg.VhostHttpTimeout = vhostHttpTimeout return } diff --git a/conf/frps_full.ini b/conf/frps_full.ini index 192bf1bc..4b61facb 100644 --- a/conf/frps_full.ini +++ b/conf/frps_full.ini @@ -67,5 +67,5 @@ subdomain_host = frps.com # if tcp stream multiplexing is used, default is true tcp_mux = true -# if Response Header Timeout more the 30s ,fix the pars . -ResponseHeaderTimeout = 30 \ No newline at end of file +# if long connection for more than 30 seconds and disconnection of the server ,fix the pars . +vhost_http_timeout = 30 \ No newline at end of file diff --git a/models/config/server_common.go b/models/config/server_common.go index b0179c3a..a92b9d2f 100644 --- a/models/config/server_common.go +++ b/models/config/server_common.go @@ -68,42 +68,42 @@ type ServerCommonConf struct { SubDomainHost string `json:"subdomain_host"` TcpMux bool `json:"tcp_mux"` - AllowPorts map[int]struct{} - MaxPoolCount int64 `json:"max_pool_count"` - MaxPortsPerClient int64 `json:"max_ports_per_client"` - HeartBeatTimeout int64 `json:"heart_beat_timeout"` - UserConnTimeout int64 `json:"user_conn_timeout"` - ResponseHeaderTimeout int64 `json:"Response_Header_Timeout"` + AllowPorts map[int]struct{} + MaxPoolCount int64 `json:"max_pool_count"` + 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 { return &ServerCommonConf{ - BindAddr: "0.0.0.0", - BindPort: 7000, - BindUdpPort: 0, - KcpBindPort: 0, - ProxyBindAddr: "0.0.0.0", - VhostHttpPort: 0, - VhostHttpsPort: 0, - DashboardAddr: "0.0.0.0", - DashboardPort: 0, - DashboardUser: "admin", - DashboardPwd: "admin", - AssetsDir: "", - LogFile: "console", - LogWay: "console", - LogLevel: "info", - LogMaxDays: 3, - Token: "", - AuthTimeout: 900, - SubDomainHost: "", - TcpMux: true, - AllowPorts: make(map[int]struct{}), - MaxPoolCount: 5, - MaxPortsPerClient: 0, - HeartBeatTimeout: 90, - UserConnTimeout: 10, - ResponseHeaderTimeout: 30, + BindAddr: "0.0.0.0", + BindPort: 7000, + BindUdpPort: 0, + KcpBindPort: 0, + ProxyBindAddr: "0.0.0.0", + VhostHttpPort: 0, + VhostHttpsPort: 0, + DashboardAddr: "0.0.0.0", + DashboardPort: 0, + DashboardUser: "admin", + DashboardPwd: "admin", + AssetsDir: "", + LogFile: "console", + LogWay: "console", + LogLevel: "info", + LogMaxDays: 3, + Token: "", + AuthTimeout: 900, + SubDomainHost: "", + TcpMux: true, + AllowPorts: make(map[int]struct{}), + MaxPoolCount: 5, + MaxPortsPerClient: 0, + HeartBeatTimeout: 90, + UserConnTimeout: 10, + VhostHttpTimeout: 30, } } @@ -302,13 +302,13 @@ func UnmarshalServerConfFromIni(defaultCfg *ServerCommonConf, content string) (c cfg.HeartBeatTimeout = v } } - if tmpStr, ok = conf.Get("common", "Response_Header_Timeout"); ok { + 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: Response_Header_Timeout is incorrect") + err = fmt.Errorf("Parse conf error: vhost_http_timeout is incorrect") return } else { - cfg.ResponseHeaderTimeout = v + cfg.VhostHttpTimeout = v } } return diff --git a/utils/vhost/newhttp.go b/utils/vhost/newhttp.go index 42b96a5f..6cfadf9c 100644 --- a/utils/vhost/newhttp.go +++ b/utils/vhost/newhttp.go @@ -32,7 +32,7 @@ import ( ) var ( - responseHeaderTimeout = time.Duration(g.GlbServerCfg.ResponseHeaderTimeout) * time.Second + responseHeaderTimeout = time.Duration(g.GlbServerCfg.VhostHttpTimeout) * time.Second ErrRouterConfigConflict = errors.New("router config conflict") ErrNoDomain = errors.New("no such domain")