Merge pull request #8 from jellyfin/master

rebase to latest master

1 files changed, 8 insertions, 15 deletions

diff --git a/SocketHttpListener/Net/HttpListenerRequest.cs b/SocketHttpListener/Net/HttpListenerRequest.cs
index 1b369dfa8..4924a7fa8 100644
--- a/SocketHttpListener/Net/HttpListenerRequest.cs
+++ b/SocketHttpListener/Net/HttpListenerRequest.cs
@@ -1,16 +1,9 @@
 using System;
-using System.Collections.Specialized;
+using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Net;
-using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Text;
-using SocketHttpListener.Primitives;
-using System.Collections.Generic;
 using SocketHttpListener.Net.WebSockets;
 
 namespace SocketHttpListener.Net
@@ -27,9 +20,9 @@ namespace SocketHttpListener.Net
 
         public string[] UserLanguages => Helpers.ParseMultivalueHeader(Headers[HttpKnownHeaderNames.AcceptLanguage]);
 
-        private CookieCollection ParseCookies(Uri uri, string setCookieHeader)
+        private static CookieCollection ParseCookies(Uri uri, string setCookieHeader)
         {
-            CookieCollection cookies = new CookieCollection();
+            var cookies = new CookieCollection();
             return cookies;
         }
 
@@ -88,7 +81,7 @@ namespace SocketHttpListener.Net
                         }
                     }
                 }
-                return TextEncodingExtensions.GetDefaultEncoding();
+                return Encoding.UTF8;
             }
         }
 
@@ -177,7 +170,7 @@ namespace SocketHttpListener.Net
         {
             get
             {
-                QueryParamCollection queryString = new QueryParamCollection();
+                var queryString = new QueryParamCollection();
                 Helpers.FillFromString(queryString, Url.Query, true, ContentEncoding);
                 return queryString;
             }
@@ -203,7 +196,7 @@ namespace SocketHttpListener.Net
                     return null;
                 }
 
-                bool success = Uri.TryCreate(referrer, UriKind.RelativeOrAbsolute, out Uri urlReferrer);
+                bool success = Uri.TryCreate(referrer, UriKind.RelativeOrAbsolute, out var urlReferrer);
                 return success ? urlReferrer : null;
             }
         }
@@ -302,7 +295,7 @@ namespace SocketHttpListener.Net
 
                 // collect comma-separated values into list
 
-                List<string> values = new List<string>();
+                var values = new List<string>();
                 int i = 0;
 
                 while (i < l)
@@ -347,7 +340,7 @@ namespace SocketHttpListener.Net
             private static string UrlDecodeStringFromStringInternal(string s, Encoding e)
             {
                 int count = s.Length;
-                UrlDecoder helper = new UrlDecoder(count, e);
+                var helper = new UrlDecoder(count, e);
 
                 // go through the string's chars collapsing %XX and %uXXXX and
                 // appending each char as char, with exception of %XX constructs