aboutsummaryrefslogtreecommitdiff
path: root/SocketHttpListener/Net/HttpConnection.cs
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2019-01-24 22:57:44 -0500
committerGitHub <noreply@github.com>2019-01-24 22:57:44 -0500
commit2c9e056d52840dd98da27a6527fab970150c139f (patch)
tree8af78ab36731a998807633e5b76d26f26de9faed /SocketHttpListener/Net/HttpConnection.cs
parente05e002b8bb4d13eb2b80b56a0aad8903ddb701e (diff)
parent1d7d4c573875093b97a5929fdee976cd0dcbedea (diff)
Merge pull request #699 from jellyfin/dev
Dev sync
Diffstat (limited to 'SocketHttpListener/Net/HttpConnection.cs')
-rw-r--r--SocketHttpListener/Net/HttpConnection.cs9
1 files changed, 0 insertions, 9 deletions
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
{