ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +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);
}
}

9
OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpResponse.cs
View File

@@ -68,7 +68,7 @@ namespace OSHttpServer
public ConnectionType Connection
{
get { return m_Connetion; }
set { return; }
set { m_Connetion = value; }
}
private int m_priority = 0;
@@ -327,21 +327,22 @@ namespace OSHttpServer
}
m_headerBytes = GetHeaders();
/*
if (RawBuffer != null)
{
int tlen = m_headerBytes.Length + RawBufferLen;
if(RawBufferLen > 0 && tlen < 16384)
{
byte[] tmp = new byte[tlen];
Array.Copy(m_headerBytes, tmp, m_headerBytes.Length);
Array.Copy(RawBuffer, RawBufferStart, tmp, m_headerBytes.Length, RawBufferLen);
Buffer.BlockCopy(m_headerBytes, 0, tmp, 0, m_headerBytes.Length);
Buffer.BlockCopy(RawBuffer, RawBufferStart, tmp, m_headerBytes.Length, RawBufferLen);
m_headerBytes = null;
RawBuffer = tmp;
RawBufferStart = 0;
RawBufferLen = tlen;
}
}
*/
m_context.StartSendResponse(this);
}

2
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
View File

@@ -31,7 +31,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Servers.HttpServer
{
public delegate void RequestMethod(UUID ID, OSHttpRequest request);
public delegate OSHttpResponse RequestMethod(UUID ID, OSHttpRequest request);
public delegate bool HasEventsMethod(UUID requestID, UUID pId);
public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);

3
OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
View File

@@ -138,7 +138,7 @@ namespace OpenSim.Region.ClientStack.Linden
lock(m_loadLock)
{
if (m_assetService == null && m_NumberScenes == 0)
if (m_assetService == null)
{
m_assetService = s.RequestModuleInterface<IAssetService>();
// We'll reuse the same handler for all requests.
@@ -300,6 +300,7 @@ namespace OpenSim.Region.ClientStack.Linden
reqinfo.request = request;
m_queue.Add(reqinfo);
return null;
};
// this should never happen except possible on shutdown

1
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
View File

@@ -304,6 +304,7 @@ namespace OpenSim.Region.ClientStack.Linden
reqinfo.reqID = requestID;
reqinfo.request = request;
m_queue.Add(reqinfo);
return null;
};
NoEvents = (x, y) =>