Merge pull request #699 from jellyfin/dev

Dev sync

4 files changed, 0 insertions, 40 deletions

diff --git a/SocketHttpListener/HttpBase.cs b/SocketHttpListener/HttpBase.cs
index fea91d84b..c386b9374 100644
--- a/SocketHttpListener/HttpBase.cs
+++ b/SocketHttpListener/HttpBase.cs
@@ -13,12 +13,6 @@ namespace SocketHttpListener
 
         #endregion
 
-        #region Internal Fields
-
-        internal byte[] EntityBodyData;
-
-        #endregion
-
         #region Protected Fields
 
         protected const string CrLf = "\r\n";
@@ -37,18 +31,6 @@ namespace SocketHttpListener
 
         #region Public Properties
 
-        public string EntityBody
-        {
-            get
-            {
-                var data = EntityBodyData;
-
-                return data != null && data.Length > 0
-                       ? getEncoding(_headers["Content-Type"]).GetString(data, 0, data.Length)
-                       : string.Empty;
-            }
-        }
-
         public QueryParamCollection Headers => _headers;
 
         public Version ProtocolVersion => _version;
diff --git a/SocketHttpListener/HttpResponse.cs b/SocketHttpListener/HttpResponse.cs
index bcfa4a906..d5d9b4a1c 100644
--- a/SocketHttpListener/HttpResponse.cs
+++ b/SocketHttpListener/HttpResponse.cs
@@ -115,10 +115,6 @@ namespace SocketHttpListener
 
             output.Append(CrLf);
 
-            var entity = EntityBody;
-            if (entity.Length > 0)
-                output.Append(entity);
-
             return output.ToString();
         }
 
diff --git a/SocketHttpListener/Net/HttpConnection.cs b/SocketHttpListener/Net/HttpConnection.cs
index f11cb0725..e89f4ed9b 100644
--- a/SocketHttpListener/Net/HttpConnection.cs
+++ b/SocketHttpListener/Net/HttpConnection.cs
@@ -32,8 +32,6 @@ namespace SocketHttpListener.Net
         int _reuses;
         bool _contextBound;
         bool secure;
-        int _timeout = 90000; // 90k ms for first request, 15k ms from then on
-        private Timer _timer;
         IPEndPoint local_ep;
         HttpListener _lastListener;
         X509Certificate cert;
@@ -91,8 +89,6 @@ namespace SocketHttpListener.Net
 
         public async Task Init()
         {
-            _timer = new Timer(OnTimeout, null, Timeout.Infinite, Timeout.Infinite);
-
             if (ssl_stream != null)
             {
                 var enableAsync = true;
@@ -162,14 +158,10 @@ namespace SocketHttpListener.Net
                 _buffer = new byte[BufferSize];
             try
             {
-                if (_reuses == 1)
-                    _timeout = 15000;
-                //_timer.Change(_timeout, Timeout.Infinite);
                 _stream.BeginRead(_buffer, 0, BufferSize, s_onreadCallback, this);
             }
             catch
             {
-                //_timer.Change(Timeout.Infinite, Timeout.Infinite);
                 CloseSocket();
                 Unbind();
             }
@@ -216,7 +208,6 @@ namespace SocketHttpListener.Net
 
         private void OnReadInternal(IAsyncResult ares)
         {
-            //_timer.Change(Timeout.Infinite, Timeout.Infinite);
             int nread = -1;
             try
             {
diff --git a/SocketHttpListener/WebSocket.cs b/SocketHttpListener/WebSocket.cs
index bf400599d..128bc8b97 100644
--- a/SocketHttpListener/WebSocket.cs
+++ b/SocketHttpListener/WebSocket.cs
@@ -24,7 +24,6 @@ namespace SocketHttpListener
     {
         #region Private Fields
 
-        private string _base64Key;
         private Action _closeContext;
         private CompressionMethod _compression;
         private WebSocketContext _context;
@@ -35,20 +34,12 @@ namespace SocketHttpListener
         private object _forMessageEventQueue;
         private object _forSend;
         private const string _guid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-        private Func<WebSocketContext, string>
-                                        _handshakeRequestChecker;
         private Queue<MessageEventArgs> _messageEventQueue;
-        private uint _nonceCount;
-        private string _origin;
-        private bool _preAuth;
         private string _protocol;
-        private string[] _protocols;
-        private Uri _proxyUri;
         private volatile WebSocketState _readyState;
         private AutoResetEvent _receivePong;
         private bool _secure;
         private Stream _stream;
-        private Uri _uri;
         private const string _version = "13";
 
         #endregion