Merge pull request #1637 from fatedier/dev

bump version to v0.31.2
2025-11-30 21:25:22 +00:00 · 2020-02-04 21:54:28 +08:00 · 2020-02-04 21:43:37 +08:00 · 2020-02-04 21:39:26 +08:00 · 2020-02-04 21:34:46 +08:00 · 2020-02-04 19:41:39 +08:00
5 changed files with 11 additions and 11 deletions
--- a/README_zh.md
+++ b/README_zh.md
@@ -546,10 +546,10 @@ allow_ports = 2000-3000,3001,3003,4000-50000
 type = tcp
 local_port = 22
 remote_port = 6000
-bandwith_limit = 1MB
+bandwidth_limit = 1MB
 ```

-在代理配置中增加 `bandwith_limit` 字段启用此功能，目前仅支持 `MB` 和 `KB` 单位。
+在代理配置中增加 `bandwidth_limit` 字段启用此功能，目前仅支持 `MB` 和 `KB` 单位。

 ### TCP 多路复用

--- a/client/proxy/proxy_wrapper.go
+++ b/client/proxy/proxy_wrapper.go
@@ -112,6 +112,7 @@ func (pw *ProxyWrapper) SetRunningStatus(remoteAddr string, respErr string) erro
 	}

 	if err := pw.pxy.Run(); err != nil {
+		pw.close()
 		pw.Status = ProxyStatusStartErr
 		pw.Err = err.Error()
 		pw.lastStartErr = time.Now()
@@ -140,7 +141,10 @@ func (pw *ProxyWrapper) Stop() {
 		pw.monitor.Stop()
 	}
 	pw.Status = ProxyStatusClosed
+	pw.close()
+}

+func (pw *ProxyWrapper) close() {
 	pw.handler(event.EvCloseProxy, &event.CloseProxyPayload{
 		CloseProxyMsg: &msg.CloseProxy{
 			ProxyName: pw.Name,
@@ -178,11 +182,7 @@ func (pw *ProxyWrapper) checkWorker() {
 		} else {
 			pw.mu.Lock()
 			if pw.Status == ProxyStatusRunning || pw.Status == ProxyStatusWaitStart {
-				pw.handler(event.EvCloseProxy, &event.CloseProxyPayload{
-					CloseProxyMsg: &msg.CloseProxy{
-						ProxyName: pw.Name,
-					},
-				})
+				pw.close()
 				xl.Trace("change status from [%s] to [%s]", pw.Status, ProxyStatusCheckFailed)
 				pw.Status = ProxyStatusCheckFailed
 			}
--- a/conf/frpc_full.ini
+++ b/conf/frpc_full.ini
@@ -75,8 +75,8 @@ meta_var2 = 234
 type = tcp
 local_ip = 127.0.0.1
 local_port = 22
-# limit bandwith for this proxy, unit is KB and MB
-bandwith_limit = 1MB
+# limit bandwidth for this proxy, unit is KB and MB
+bandwidth_limit = 1MB
 # true or false, if true, messages between frps and frpc will be encrypted, default is false
 use_encryption = false
 # if true, message will be compressed
--- a/utils/version/version.go
+++ b/utils/version/version.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 )

-var version string = "0.31.1"
+var version string = "0.31.2"

 func Full() string {
 	return version
--- a/utils/vhost/resource.go
+++ b/utils/vhost/resource.go
@@ -41,7 +41,7 @@ const (
 </style>
 </head>
 <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/>
 Please try again later.</p>
 <p>The server is powered by <a href="https://github.com/fatedier/frp">frp</a>.</p>
Author	SHA1	Message	Date
fatedier	487c8d7c29	Merge pull request #1637 from fatedier/dev bump version to v0.31.2	2020-02-04 21:54:28 +08:00
fatedier	69fa7ed16e	bump version to v0.31.2	2020-02-04 21:43:37 +08:00
fatedier	5336155365	Merge pull request #1636 from fatedier/new send closeProxy msg to server then client start proxy error	2020-02-04 21:39:26 +08:00
fatedier	4feb74cb89	doc typo	2020-02-04 21:34:46 +08:00
fatedier	4a4cf552af	send closeProxy msg to server then client start proxy error, fix #1606	2020-02-04 19:41:39 +08:00
Joe Cloud	0f59b8f329	English grammar fix. (#1619 )	2020-01-15 12:11:12 +08:00