cmd/server: handle empty NegotiatedProtocol with gateway

zllovesuki · Sep 13, 2021 · e17e603 · e17e603
1 parent aa09d60
commit e17e603
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -163,7 +163,7 @@ func main() {
 	alpnMux := gateway.NewALPNMux(logger, gMux)
 
 	clientTLSListener := alpnMux.For("multiplexer")
-	gatewayListener := alpnMux.For("http/1.1")
+	gatewayListener := alpnMux.For("http/1.1", "")
 
 	domain := bundle.Web.Domain
 	if *gatewayPort != 443 {

diff --git a/gateway/alpn.go b/gateway/alpn.go
@@ -80,9 +80,11 @@ func (a *ALPN) Serve(ctx context.Context) {
 	}
 }
 
-func (a *ALPN) For(proto string) net.Listener {
+func (a *ALPN) For(protos ...string) net.Listener {
 	ch := make(chan net.Conn, 32)
-	a.protos.Store(proto, ch)
+	for _, proto := range protos {
+		a.protos.Store(proto, ch)
+	}
 	return &protoListener{
 		l: a.listener,
 		c: ch,