Skip to content

F
frp

企猫商务 / frp
与 Fork 源项目一致

从无法访问的项目Fork

通知 3
Star 0
Fork 0
F
frp

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 487c8d7c 编写于 作者: F fatedier 提交者： GitHub
浏览文件
操作

Merge pull request #1637 from fatedier/dev 

bump version to v0.31.2
上级 f480160e 69fa7ed1
隐藏空白更改
内联 并排
Showing with 11 addition and 11 deletion
README_zh.md
浏览文件 @ 487c8d7c
...@@ -546,10 +546,10 @@ allow_ports = 2000-3000,3001,3003,4000-50000 ...@@ -546,10 +546,10 @@ allow_ports = 2000-3000,3001,3003,4000-50000
type = tcp type = tcp
local_port = 22 local_port = 22
remote_port = 6000 remote_port = 6000
bandwith_limit = 1MB bandwidth_limit = 1MB
``` ```
在代理配置中增加 `bandwith_limit` 字段启用此功能，目前仅支持 `MB` 和 `KB` 单位。 在代理配置中增加 `bandwidth_limit` 字段启用此功能，目前仅支持 `MB` 和 `KB` 单位。
### TCP 多路复用 ### TCP 多路复用
......
client/proxy/proxy_wrapper.go
浏览文件 @ 487c8d7c
...@@ -112,6 +112,7 @@ func (pw *ProxyWrapper) SetRunningStatus(remoteAddr string, respErr string) erro ...@@ -112,6 +112,7 @@ func (pw *ProxyWrapper) SetRunningStatus(remoteAddr string, respErr string) erro
} }
if err := pw.pxy.Run(); err != nil { if err := pw.pxy.Run(); err != nil {
pw.close()
pw.Status = ProxyStatusStartErr pw.Status = ProxyStatusStartErr
pw.Err = err.Error() pw.Err = err.Error()
pw.lastStartErr = time.Now() pw.lastStartErr = time.Now()
...@@ -140,7 +141,10 @@ func (pw *ProxyWrapper) Stop() { ...@@ -140,7 +141,10 @@ func (pw *ProxyWrapper) Stop() {
pw.monitor.Stop() pw.monitor.Stop()
} }
pw.Status = ProxyStatusClosed pw.Status = ProxyStatusClosed
pw.close()
}
func (pw *ProxyWrapper) close() {
pw.handler(event.EvCloseProxy, &event.CloseProxyPayload{ pw.handler(event.EvCloseProxy, &event.CloseProxyPayload{
CloseProxyMsg: &msg.CloseProxy{ CloseProxyMsg: &msg.CloseProxy{
ProxyName: pw.Name, ProxyName: pw.Name,
...@@ -178,11 +182,7 @@ func (pw *ProxyWrapper) checkWorker() { ...@@ -178,11 +182,7 @@ func (pw *ProxyWrapper) checkWorker() {
} else { } else {
pw.mu.Lock() pw.mu.Lock()
if pw.Status == ProxyStatusRunning || pw.Status == ProxyStatusWaitStart { if pw.Status == ProxyStatusRunning || pw.Status == ProxyStatusWaitStart {
pw.handler(event.EvCloseProxy, &event.CloseProxyPayload{ pw.close()
CloseProxyMsg: &msg.CloseProxy{
ProxyName: pw.Name,
},
})
xl.Trace("change status from [%s] to [%s]", pw.Status, ProxyStatusCheckFailed) xl.Trace("change status from [%s] to [%s]", pw.Status, ProxyStatusCheckFailed)
pw.Status = ProxyStatusCheckFailed pw.Status = ProxyStatusCheckFailed
} }
......
conf/frpc_full.ini
浏览文件 @ 487c8d7c
...@@ -75,8 +75,8 @@ meta_var2 = 234 ...@@ -75,8 +75,8 @@ meta_var2 = 234
type = tcp type = tcp
local_ip = 127.0.0.1 local_ip = 127.0.0.1
local_port = 22 local_port = 22
# limit bandwith for this proxy, unit is KB and MB # limit bandwidth for this proxy, unit is KB and MB
bandwith_limit = 1MB bandwidth_limit = 1MB
# true or false, if true, messages between frps and frpc will be encrypted, default is false # true or false, if true, messages between frps and frpc will be encrypted, default is false
use_encryption = false use_encryption = false
# if true, message will be compressed # if true, message will be compressed
......
utils/version/version.go
浏览文件 @ 487c8d7c
...@@ -19,7 +19,7 @@ import ( ...@@ -19,7 +19,7 @@ import (
"strings" "strings"
) )
var version string = "0.31.1" var version string = "0.31.2"
func Full() string { func Full() string {
return version return version
......
utils/vhost/resource.go
浏览文件 @ 487c8d7c
...@@ -41,7 +41,7 @@ const ( ...@@ -41,7 +41,7 @@ const (
</style> </style>
</head> </head>
<body> <body>
<h1>The page you visit not found.</h1> <h1>The page you requested was not found.</h1>
<p>Sorry, the page you are looking for is currently unavailable.<br/> <p>Sorry, the page you are looking for is currently unavailable.<br/>
Please try again later.</p> Please try again later.</p>
<p>The server is powered by <a href="https://github.com/fatedier/frp">frp</a>.</p> <p>The server is powered by <a href="https://github.com/fatedier/frp">frp</a>.</p>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或