guoswork
/
frp
mirror of https://gitee.com/IrisVega/frp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2310 from fatedier/dev 

bump version
This commit is contained in:
fatedier 2021-03-18 11:14:56 +08:00 committed by GitHub
parent 76a1efccd9 fdef7448a7
commit 55da58eca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Release.md
View File

@ -1,12 +0,0 @@
### New
* New plugin `https2https`.
* frpc supports `tls_server_name` to override the default value from `server_addr`.
### Improvement
* Increase reconnect frequency if it occurs an network error between frpc and frps.
### Fix
* Fix panic issue about xtcp.

2
pkg/util/version/version.go
View File

@ -19,7 +19,7 @@ import (
"strings"
)
var version string = "0.36.0"
var version string = "0.36.1"
func Full() string {
return version

2
server/service.go
View File

@ -265,7 +265,7 @@ func NewService(cfg config.ServerCommonConf) (svr *Service, err error) {
// Create nat hole controller.
if cfg.BindUDPPort > 0 {
var nc *nathole.Controller
address := net.JoinHostPort(cfg.BindAddr, strconv.Itoa(cfg.BindPort))
address := net.JoinHostPort(cfg.BindAddr, strconv.Itoa(cfg.BindUDPPort))
nc, err = nathole.NewController(address)
if err != nil {
err = fmt.Errorf("Create nat hole controller error, %v", err)