XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-27 07:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/detailed-errors-to-client

Browse Source 
# Conflicts:
#	models/config/server_common.go
This commit is contained in:
Guy Lewin
2020-02-11 11:25:04 +02:00
parent f8c6795119 95753ebf1c
commit 9440bc5d72
5 changed files with 111 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/service.go
View File

@@ -284,7 +284,7 @@ func (svr *Service) HandleListener(l net.Listener) {
log.Trace("start check TLS connection...")
originConn := c
c, err = frpNet.CheckAndEnableTLSServerConnWithTimeout(c, svr.tlsConfig, connReadTimeout)
c, err = frpNet.CheckAndEnableTLSServerConnWithTimeout(c, svr.tlsConfig, svr.cfg.TlsOnly, connReadTimeout)
if err != nil {
log.Warn("CheckAndEnableTLSServerConnWithTimeout error: %v", err)
originConn.Close()