Merge pull request #1160 from fatedier/dev

bump version to v0.25.3, fix #1159
fatedier · Mar 26, 2019 · a8ab4c5 · a8ab4c5
2 parents 4b7aef2 + 9cee263
commit a8ab4c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/package.sh b/package.sh
@@ -44,7 +44,7 @@ for os in $os_all; do
             mv ./frps_${os}_${arch} ${frp_path}/frps
         fi  
         cp ./LICENSE ${frp_path}
-        cp ./conf/* ${frp_path}
+        cp -rf ./conf/* ${frp_path}
 
         # packages
         cd ./packages

diff --git a/utils/net/conn.go b/utils/net/conn.go
@@ -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) {
 	c, err = ConnectServerByProxy(proxyUrl, protocol, addr)
+	if err != nil {
+		return
+	}
+
 	if tlsConfig == nil {
 		return
 	}

diff --git a/utils/version/version.go b/utils/version/version.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 )
 
-var version string = "0.25.2"
+var version string = "0.25.3"
 
 func Full() string {
 	return version