mirror of
				https://github.com/nadoo/glider.git
				synced 2025-11-04 07:42:38 +08:00 
			
		
		
		
	Merge branch 'master' into dev
This commit is contained in:
		
						commit
						63caac133d
					
				@ -84,6 +84,7 @@ func (s *Trojan) Serve(c net.Conn) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	if s.withTLS {
 | 
						if s.withTLS {
 | 
				
			||||||
		tlsConn := tls.Server(c, s.tlsConfig)
 | 
							tlsConn := tls.Server(c, s.tlsConfig)
 | 
				
			||||||
 | 
							defer tlsConn.Close()
 | 
				
			||||||
		err := tlsConn.Handshake()
 | 
							err := tlsConn.Handshake()
 | 
				
			||||||
		if err != nil {
 | 
							if err != nil {
 | 
				
			||||||
			log.F("[trojan] error in tls handshake: %s", err)
 | 
								log.F("[trojan] error in tls handshake: %s", err)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user