Fix ws server when no protocol supplied - http://forum.espruino.com/c…

…onversations/320553/#comment14654094
espruino · Mar 13, 2019 · 74d779d · 74d779d
1 parent b1ebb11
commit 74d779d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/modules/ws.js b/modules/ws.js
@@ -252,12 +252,14 @@ exports.createServer = function(callback) {
     if (req.headers.Connection && req.headers.Connection.indexOf("Upgrade")>=0) {
       var key = req.headers["Sec-WebSocket-Key"];
       var accept = btoa(E.toString(require('crypto').SHA1(key+"258EAFA5-E914-47DA-95CA-C5AB0DC85B11")));
-      res.writeHead(101, {
+      var headers = {
           'Upgrade': 'websocket',
           'Connection': 'Upgrade',
-          'Sec-WebSocket-Accept': accept,
-          'Sec-WebSocket-Protocol': req.headers["Sec-WebSocket-Protocol"]
-      });
+          'Sec-WebSocket-Accept': accept
+      };
+      if (req.headers["Sec-WebSocket-Protocol"])
+        headers['Sec-WebSocket-Protocol'] = req.headers["Sec-WebSocket-Protocol"];
+      res.writeHead(101, headers);
 
       var ws = new WebSocket(undefined, { masking : false, connected : true });
       ws.socket = res;