merge from frp 0.28.2

This commit is contained in:
haidy 2019-08-13 22:20:48 +08:00
parent b86ff20d5a
commit b661dfb6ec

View File

@ -113,9 +113,8 @@ func NewService() (svr *Service, err error) {
TcpPortManager: ports.NewPortManager("tcp", cfg.ProxyBindAddr, cfg.AllowPorts), TcpPortManager: ports.NewPortManager("tcp", cfg.ProxyBindAddr, cfg.AllowPorts),
UdpPortManager: ports.NewPortManager("udp", cfg.ProxyBindAddr, cfg.AllowPorts), UdpPortManager: ports.NewPortManager("udp", cfg.ProxyBindAddr, cfg.AllowPorts),
}, },
Closed: true, Closed: true,
closedCh: make(chan bool), closedCh: make(chan bool),
tlsConfig: generateTLSConfig(),
httpVhostRouter: vhost.NewVhostRouters(), httpVhostRouter: vhost.NewVhostRouters(),
tlsConfig: generateTLSConfig(), tlsConfig: generateTLSConfig(),
} }