ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

reenable keepalive local override, + cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2020-11-29 12:29:18 +00:00
parent 5552716724
commit 4ad892e090
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -610,8 +610,16 @@ namespace OpenSim.Framework.Servers.HttpServer
{
psEvArgs.RequestsReceived++;
PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, request);
psEvArgs.Request?.Invoke(psreq.RequestID, osRequest);
m_pollServiceManager.Enqueue(psreq);
if(psEvArgs.Request == null)
m_pollServiceManager.Enqueue(psreq);
else
{
OSHttpResponse resp = psEvArgs.Request.Invoke(psreq.RequestID, osRequest);
if(resp == null)
m_pollServiceManager.Enqueue(psreq);
else
resp.Send();
}
psreq = null;
}
else
@@ -621,7 +629,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
catch (Exception e)
{
m_log.Error(String.Format("[BASE HTTP SERVER]: OnRequest() failed: {0} ", e.Message), e);
m_log.Error(string.Format("[BASE HTTP SERVER]: OnRequest() failed: {0} ", e.Message), e);
}
}