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

Merge pull request #1160 from fatedier/dev 

bump version to v0.25.3, fix #1159
This commit is contained in:
fatedier 2019-03-26 19:33:39 +08:00 committed by GitHub
parent 4b7aef2196 9cee263c91
commit a8ab4c5003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.sh
View File

@ -44,7 +44,7 @@ for os in $os_all; do
mv ./frps_${os}_${arch} ${frp_path}/frps mv ./frps_${os}_${arch} ${frp_path}/frps
fi fi
cp ./LICENSE ${frp_path} cp ./LICENSE ${frp_path}
cp ./conf/* ${frp_path} cp -rf ./conf/* ${frp_path}
# packages # packages
cd ./packages cd ./packages

4
utils/net/conn.go
View File

@ -211,6 +211,10 @@ func ConnectServerByProxy(proxyUrl string, protocol string, addr string) (c Conn
func ConnectServerByProxyWithTLS(proxyUrl string, protocol string, addr string, tlsConfig *tls.Config) (c Conn, err error) { func ConnectServerByProxyWithTLS(proxyUrl string, protocol string, addr string, tlsConfig *tls.Config) (c Conn, err error) {
c, err = ConnectServerByProxy(proxyUrl, protocol, addr) c, err = ConnectServerByProxy(proxyUrl, protocol, addr)
if err != nil {
return
}
if tlsConfig == nil { if tlsConfig == nil {
return return
} }

2
utils/version/version.go
View File

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