OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dispose prematurely discon sockets

master
UbitUmarov 2020-07-15 19:15:11 +01:00
parent 402186844c
commit 4bc74139a4
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs
View File

@ -140,6 +140,11 @@ namespace OSHttpServer
m_listener.BeginAcceptSocket(OnAccept, null); m_listener.BeginAcceptSocket(OnAccept, null);
beginAcceptCalled = true; beginAcceptCalled = true;
Socket socket = m_listener.EndAcceptSocket(ar); Socket socket = m_listener.EndAcceptSocket(ar);
if (!socket.Connected)
{
socket.Dispose();
return;
}
if (!OnAcceptingSocket(socket)) if (!OnAcceptingSocket(socket))
{ {
@ -147,12 +152,18 @@ namespace OSHttpServer
return; return;
} }
m_logWriter.Write(this, LogPrio.Debug, "Accepted connection from: " + socket.RemoteEndPoint); if(socket.Connected)
{
if (m_certificate != null) m_logWriter.Write(this, LogPrio.Debug, "Accepted connection from: " + socket.RemoteEndPoint);
m_contextFactory.CreateSecureContext(socket, m_certificate, m_sslProtocol, m_clientCertValCallback);
if (m_certificate != null)
m_contextFactory.CreateSecureContext(socket, m_certificate, m_sslProtocol, m_clientCertValCallback);
else
m_contextFactory.CreateContext(socket);
}
else else
m_contextFactory.CreateContext(socket); socket.Dispose();
} }
catch (Exception err) catch (Exception err)
{ {