From 1eb4a917fead340cbc2fdb175ee4a5d7c71e0ddd Mon Sep 17 00:00:00 2001
From: haidy <haidy-cao@qq.com>
Date: Sun, 24 Mar 2019 08:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=200.25.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/control.go | 3 +--
 client/service.go | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/control.go b/client/control.go
index 4b458a7b..409f7941 100644
--- a/client/control.go
+++ b/client/control.go
@@ -16,7 +16,6 @@ package client
 
 import (
 	"crypto/tls"
-	"fmt"
 	"io"
 	"runtime/debug"
 	"sync"
@@ -182,7 +181,7 @@ func (ctl *Control) connectServer() (conn frpNet.Conn, err error) {
 				InsecureSkipVerify: true,
 			}
 		}
-		conn, err = frpNet.ConnectServerByProxy(g.GlbClientCfg.HttpProxy, g.GlbClientCfg.Protocol,
+		conn, err = frpNet.ConnectServerByProxyWithTLS(g.GlbClientCfg.HttpProxy, g.GlbClientCfg.Protocol,
 			newAddress(g.GlbClientCfg.ServerAddr, g.GlbClientCfg.ServerPort), tlsConfig)
 		if err != nil {
 			ctl.Warn("start new connection to server error: %v", err)
diff --git a/client/service.go b/client/service.go
index 7fed2dc2..f0fea07e 100644
--- a/client/service.go
+++ b/client/service.go
@@ -170,15 +170,15 @@ func (svr *Service) login() (conn frpNet.Conn, session *fmux.Session, err error)
 			InsecureSkipVerify: true,
 		}
 	}
-	conn, err = frpNet.ConnectServerByProxy(g.GlbClientCfg.HttpProxy, g.GlbClientCfg.Protocol,
+	conn, err = frpNet.ConnectServerByProxyWithTLS(g.GlbClientCfg.HttpProxy, g.GlbClientCfg.Protocol,
 		newAddress(g.GlbClientCfg.ServerAddr, g.GlbClientCfg.ServerPort), tlsConfig)
 	if err != nil {
 		return
 	}
 
 	defer func() {
-		if err != nil {
-			conn.Close()
+		if err != nil && conn != nil {
+			_ = conn.Close()
 		}
 	}()