Merge branch 'main' into dev

This commit is contained in:
Derek Collison
2023-06-21 12:13:38 -07:00

View File

@@ -2322,7 +2322,7 @@ func (c *client) generateClientInfoJSON(info Info) []byte {
if c.srv != nil { // Otherwise lame duck info can panic
c.srv.websocket.mu.RLock()
info.TLSAvailable = c.srv.websocket.tls
if c.srv.websocket.server != nil {
if c.srv.websocket.tls && c.srv.websocket.server != nil {
if tc := c.srv.websocket.server.TLSConfig; tc != nil {
info.TLSRequired = !tc.InsecureSkipVerify
}