diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2018-12-20 22:10:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 22:10:42 -0500 |
| commit | e163fea9d9fed9f19e81999a7de45f3157db5b3e (patch) | |
| tree | ca32a6ef76f6424ae5847ee2251ac37e90f35b68 /SocketHttpListener | |
| parent | a8bce31a01225911b69f2c3b59a7397895f7b79b (diff) | |
| parent | b4bd4e3584fafe559345e47feb6f8e1d8c1ed699 (diff) | |
Merge pull request #248 from jellyfin/develop
Master 3.5.2-4
Diffstat (limited to 'SocketHttpListener')
| -rw-r--r-- | SocketHttpListener/Net/HttpListenerContext.cs | 6 | ||||
| -rw-r--r-- | SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs | 6 | ||||
| -rw-r--r-- | SocketHttpListener/WebSocket.cs | 8 |
3 files changed, 6 insertions, 14 deletions
diff --git a/SocketHttpListener/Net/HttpListenerContext.cs b/SocketHttpListener/Net/HttpListenerContext.cs index f4679568a..b90f07567 100644 --- a/SocketHttpListener/Net/HttpListenerContext.cs +++ b/SocketHttpListener/Net/HttpListenerContext.cs @@ -1,19 +1,13 @@ using System; using System.Net; using System.Security.Principal; -using MediaBrowser.Model.Cryptography; -using MediaBrowser.Model.IO; -using MediaBrowser.Model.Logging; -using MediaBrowser.Model.Text; using SocketHttpListener.Net.WebSockets; -using SocketHttpListener.Primitives; using System.Threading.Tasks; namespace SocketHttpListener.Net { public sealed unsafe partial class HttpListenerContext { - internal HttpListener _listener; private HttpListenerResponse _response; private IPrincipal _user; diff --git a/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs b/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs index e61bde32e..34b5eaf74 100644 --- a/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs +++ b/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs @@ -253,7 +253,7 @@ namespace SocketHttpListener.Net //if (NetEventSource.IsEnabled) // NetEventSource.Error(this, SR.Format(SR.net_log_listener_cant_convert_percent_value, codePoint)); } - catch (EncoderFallbackException e) + catch (EncoderFallbackException) { // If utf8Encoding.GetBytes() fails //if (NetEventSource.IsEnabled) NetEventSource.Error(this, SR.Format(SR.net_log_listener_cant_convert_to_utf8, unicodeString, e.Message)); @@ -303,11 +303,11 @@ namespace SocketHttpListener.Net return true; } - catch (DecoderFallbackException e) + catch (DecoderFallbackException) { //if (NetEventSource.IsEnabled) NetEventSource.Error(this, SR.Format(SR.net_log_listener_cant_convert_bytes, GetOctetsAsString(_rawOctets), e.Message)); } - catch (EncoderFallbackException e) + catch (EncoderFallbackException) { // If utf8Encoding.GetBytes() fails //if (NetEventSource.IsEnabled) NetEventSource.Error(this, SR.Format(SR.net_log_listener_cant_convert_to_utf8, decodedString, e.Message)); diff --git a/SocketHttpListener/WebSocket.cs b/SocketHttpListener/WebSocket.cs index 385b25aed..7d61850e6 100644 --- a/SocketHttpListener/WebSocket.cs +++ b/SocketHttpListener/WebSocket.cs @@ -299,7 +299,7 @@ namespace SocketHttpListener } OnError.Emit(this, new ErrorEventArgs(message)); } - catch (Exception ex) + catch (Exception) { } } @@ -310,7 +310,7 @@ namespace SocketHttpListener { OnError.Emit(this, new ErrorEventArgs(message)); } - catch (Exception ex) + catch (Exception) { } } @@ -423,8 +423,6 @@ namespace SocketHttpListener private bool processPingFrame(WebSocketFrame frame) { - var mask = Mask.Unmask; - return true; } @@ -796,4 +794,4 @@ namespace SocketHttpListener #endregion } -}
\ No newline at end of file +} |