aboutsummaryrefslogtreecommitdiff
path: root/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
diff options
context:
space:
mode:
authorTthecreator <epostvanthomas@kpnmail.nl>2019-01-22 15:22:42 +0000
committerGitHub <noreply@github.com>2019-01-22 15:22:42 +0000
commit189b99df16bd4c93cc96422d7282d01d9ff5b82f (patch)
tree26d7da95fe3e3b2772b8b39a2463a6c0ac7652fc /SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
parenta00c0defa8cb22774f5dc8a7d566eb36ac7307e8 (diff)
parentedcfd8b565f632088c8b1f826db8e2fbecf9790d (diff)
Merge pull request #1 from jellyfin/dev
Update from jellyfin repo
Diffstat (limited to 'SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs')
-rw-r--r--SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs13
1 files changed, 5 insertions, 8 deletions
diff --git a/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs b/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
index 571e4bdba..1cfd2dc90 100644
--- a/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
+++ b/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
using System.Threading.Tasks;
namespace SocketHttpListener.Net.WebSockets
@@ -28,12 +26,11 @@ namespace SocketHttpListener.Net.WebSockets
string origin = request.Headers[HttpKnownHeaderNames.Origin];
string[] secWebSocketProtocols = null;
- string outgoingSecWebSocketProtocolString;
bool shouldSendSecWebSocketProtocolHeader =
ProcessWebSocketProtocolHeader(
request.Headers[HttpKnownHeaderNames.SecWebSocketProtocol],
subProtocol,
- out outgoingSecWebSocketProtocolString);
+ out var outgoingSecWebSocketProtocolString);
if (shouldSendSecWebSocketProtocolHeader)
{
@@ -52,15 +49,15 @@ namespace SocketHttpListener.Net.WebSockets
response.StatusCode = (int)HttpStatusCode.SwitchingProtocols; // HTTP 101
response.StatusDescription = HttpStatusDescription.Get(HttpStatusCode.SwitchingProtocols);
- HttpResponseStream responseStream = response.OutputStream as HttpResponseStream;
+ var responseStream = response.OutputStream as HttpResponseStream;
// Send websocket handshake headers
await responseStream.WriteWebSocketHandshakeHeadersAsync().ConfigureAwait(false);
//WebSocket webSocket = WebSocket.CreateFromStream(context.Connection.ConnectedStream, isServer: true, subProtocol, keepAliveInterval);
- WebSocket webSocket = new WebSocket(subProtocol);
+ var webSocket = new WebSocket(subProtocol);
- HttpListenerWebSocketContext webSocketContext = new HttpListenerWebSocketContext(
+ var webSocketContext = new HttpListenerWebSocketContext(
request.Url,
request.Headers,
request.Cookies,