From a256b70685eb1cea226b0c2a7ae73288f5dd642f Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Thu, 24 Jun 2021 20:48:28 +0100
Subject: [PATCH] Allow setting the subprotocol header

Fixes #828, closes #829
---
 .../computercraft/core/apis/http/websocket/Websocket.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java b/src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java
index fa1399bb6..3e54be9a1 100644
--- a/src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java
@@ -22,6 +22,7 @@ import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker;
@@ -150,8 +151,9 @@ public class Websocket extends Resource<Websocket>
                             p.addLast( sslContext.newHandler( ch.alloc(), uri.getHost(), socketAddress.getPort() ) );
                         }
 
+                        String subprotocol = headers.get( HttpHeaderNames.SEC_WEBSOCKET_PROTOCOL );
                         WebSocketClientHandshaker handshaker = WebSocketClientHandshakerFactory.newHandshaker(
-                            uri, WebSocketVersion.V13, null, true, headers,
+                            uri, WebSocketVersion.V13, subprotocol, true, headers,
                             options.websocketMessage <= 0 ? MAX_MESSAGE_SIZE : options.websocketMessage
                         );