Merge pull request #598 from cvium/remove_textencoding

Remove MediaBrowser.Text for license violations and hackiness

1 files changed, 5 insertions, 7 deletions

diff --git a/SocketHttpListener/Net/HttpConnection.cs b/SocketHttpListener/Net/HttpConnection.cs
index af1c081d9..f11cb0725 100644
--- a/SocketHttpListener/Net/HttpConnection.cs
+++ b/SocketHttpListener/Net/HttpConnection.cs
@@ -11,9 +11,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.System;
-using MediaBrowser.Model.Text;
 using Microsoft.Extensions.Logging;
-using SocketHttpListener.Primitives;
 namespace SocketHttpListener.Net
 {
     sealed class HttpConnection
@@ -44,11 +42,12 @@ namespace SocketHttpListener.Net
         private readonly ILogger _logger;
         private readonly ICryptoProvider _cryptoProvider;
         private readonly IStreamHelper _streamHelper;
-        private readonly ITextEncoding _textEncoding;
         private readonly IFileSystem _fileSystem;
         private readonly IEnvironmentInfo _environment;
 
-        public HttpConnection(ILogger logger, Socket socket, HttpEndPointListener epl, bool secure, X509Certificate cert, ICryptoProvider cryptoProvider, IStreamHelper streamHelper, ITextEncoding textEncoding, IFileSystem fileSystem, IEnvironmentInfo environment)
+        public HttpConnection(ILogger logger, Socket socket, HttpEndPointListener epl, bool secure,
+            X509Certificate cert, ICryptoProvider cryptoProvider, IStreamHelper streamHelper, IFileSystem fileSystem,
+            IEnvironmentInfo environment)
         {
             _logger = logger;
             this._socket = socket;
@@ -57,7 +56,6 @@ namespace SocketHttpListener.Net
             this.cert = cert;
             _cryptoProvider = cryptoProvider;
             _streamHelper = streamHelper;
-            _textEncoding = textEncoding;
             _fileSystem = fileSystem;
             _environment = environment;
 
@@ -122,7 +120,7 @@ namespace SocketHttpListener.Net
             _position = 0;
             _inputState = InputState.RequestLine;
             _lineState = LineState.None;
-            _context = new HttpListenerContext(this, _textEncoding);
+            _context = new HttpListenerContext(this);
         }
 
         public bool IsClosed => (_socket == null);
@@ -427,7 +425,7 @@ namespace SocketHttpListener.Net
                 else
                     str = string.Format("<h1>{0}</h1>", description);
 
-                byte[] error = _textEncoding.GetDefaultEncoding().GetBytes(str);
+                byte[] error = Encoding.UTF8.GetBytes(str);
                 response.Close(error, false);
             }
             catch