Allow to customize WebSocket UPGRADE response in OnWsConnecting()

Author: chronoxor

examples/WsChatClient/Program.cs

@@ -28,7 +28,6 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
-            request.SetBody();
         }
 
         public override void OnWsConnected(HttpResponse response)

examples/WssChatClient/Program.cs

@@ -30,7 +30,6 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
-            request.SetBody();
         }
 
         public override void OnWsConnected(HttpResponse response)

performance/WsEchoClient/Program.cs

@@ -24,7 +24,6 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
-            request.SetBody();
         }
 
         public override void OnWsConnected(HttpResponse response)

performance/WsMulticastClient/Program.cs

@@ -21,7 +21,6 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
-            request.SetBody();
         }
 
         public override void OnWsReceived(byte[] buffer, long offset, long size)

performance/WssEchoClient/Program.cs

@@ -26,7 +26,6 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
-            request.SetBody();
         }
 
         public override void OnWsConnected(HttpResponse response)

performance/WssMulticastClient/Program.cs

@@ -23,7 +23,6 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
-            request.SetBody();
         }
 
         public override void OnWsReceived(byte[] buffer, long offset, long size)

source/NetCoreServer/WebSocket.cs

@@ -232,12 +232,14 @@ public bool PerformServerUpgrade(HttpRequest request, HttpResponse response)
             response.SetHeader("Connection", "Upgrade");
             response.SetHeader("Upgrade", "websocket");
             response.SetHeader("Sec-WebSocket-Accept", accept);
-            response.SetBody();
 
             // Validate WebSocket upgrade request and response
             if (!_wsHandler.OnWsConnecting(request, response))
                 return false;
 
+            // Set body of the WebSocket upgrade response
+            response.SetBody();
+
             // Send WebSocket upgrade response
             _wsHandler.SendUpgrade(response);
 

source/NetCoreServer/WsClient.cs

@@ -292,6 +292,9 @@ protected override void OnConnected()
             // Fill the WebSocket upgrade HTTP request
             OnWsConnecting(Request);
 
+            // Set body of the WebSocket upgrade HTTP request
+            Request.SetBody();
+
             // Send the WebSocket upgrade HTTP request
             if (_syncConnect)
                 SendRequest(Request);

source/NetCoreServer/WssClient.cs

@@ -296,6 +296,9 @@ protected override void OnHandshaked()
             // Fill the WebSocket upgrade HTTP request
             OnWsConnecting(Request);
 
+            // Set body of the WebSocket upgrade HTTP request
+            Request.SetBody();
+
             // Send the WebSocket upgrade HTTP request
             if (_syncConnect)
                 SendRequest(Request);

tests/WsTests.cs

@@ -28,7 +28,6 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
-            request.SetBody();
         }
         public override void OnWsConnected(HttpResponse response) { IsWsConnected = true; Connected = true; }
         public override void OnWsDisconnected() { IsWsConnected = false; Disconnected = true; }