Changeset 470 in code for trunk/cmd/soju/main.go

Timestamp:

Mar 18, 2021, 10:33:30 AM (4 years ago)

Author:

contact

Message:

Don't add "irc" in ALPN list for WebSocket servers

This is incorrect because HTTP listeners don't handle plain IRC
connections. This also prevents net/http from setting up an HTTP/2
server.

File:

• trunk/cmd/soju/main.go (modified) (2 diffs)

trunk/cmd/soju/main.go

@@ -56 +56 @@
                         log.Fatalf("failed to load TLS certificate and key: %v", err)
                 }
-                tlsCfg = &tls.Config{
-                        NextProtos:   []string{"irc"},
-                        Certificates: []tls.Certificate{cert},
-                }
+                tlsCfg = &tls.Config{Certificates: []tls.Certificate{cert}}
         }
 
@@ -90 +87 @@
                                 host = host + ":6697"
                         }
-                        ln, err := tls.Listen("tcp", host, tlsCfg)
+                        ircsTLSCfg := tlsCfg.Clone()
+                        ircsTLSCfg.NextProtos = []string{"irc"}
+                        ln, err := tls.Listen("tcp", host, ircsTLSCfg)
                         if err != nil {
                                 log.Fatalf("failed to start TLS listener on %q: %v", listen, err)