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

Merge branch 'master' of ssh://opensimulator.org:/var/git/opensim

Browse Source
This commit is contained in:
UbitUmarov
2021-03-18 18:45:28 +00:00
parent 74d86adc51 73619763b9
commit c295deb262
16 changed files with 233 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,6 +650,8 @@ namespace OpenSim.Framework.Servers.HttpServer
IRequestHandler requestHandler = null;
byte[] responseData = null;
try
{
// OpenSim.Framework.WebUtil.OSHeaderRequestID
@@ -671,6 +673,7 @@ namespace OpenSim.Framework.Servers.HttpServer
request.InputStream.Dispose();
requestEndTick = Environment.TickCount;
responseData = response.RawBuffer;
response.Send();
return;
}
@@ -692,6 +695,7 @@ namespace OpenSim.Framework.Servers.HttpServer
request.InputStream.Dispose();
requestEndTick = Environment.TickCount;
responseData = response.RawBuffer;
response.Send();
return;
}
@@ -736,6 +740,7 @@ namespace OpenSim.Framework.Servers.HttpServer
request.InputStream.Dispose();
requestEndTick = Environment.TickCount;
responseData = response.RawBuffer;
response.Send();
return;
}
@@ -744,11 +749,15 @@ namespace OpenSim.Framework.Servers.HttpServer
if (TryGetSimpleStreamHandler(path, out ISimpleStreamHandler hdr))
{
if (DebugLevel >= 3)
LogIncomingToStreamHandler(request, hdr);
hdr.Handle(request, response);
if (request.InputStream != null && request.InputStream.CanRead)
request.InputStream.Dispose();
requestEndTick = Environment.TickCount;
responseData = response.RawBuffer;
response.Send();
return;
}
@@ -898,6 +907,7 @@ namespace OpenSim.Framework.Servers.HttpServer
requestEndTick = Environment.TickCount;
buffer = null;
responseData = response.RawBuffer;
response.Send();
}
catch (SocketException e)
@@ -921,6 +931,7 @@ namespace OpenSim.Framework.Servers.HttpServer
try
{
response.StatusCode =(int)HttpStatusCode.InternalServerError;
responseData = response.RawBuffer;
response.Send();
}
catch {}
@@ -951,6 +962,19 @@ namespace OpenSim.Framework.Servers.HttpServer
Port,
tickdiff);
}
if ((DebugLevel >= 5) && (responseData != null))
{
string output = Encoding.UTF8.GetString(responseData);
if (DebugLevel == 5)
{
if (output.Length > WebUtil.MaxRequestDiagLength)
output = output.Substring(0, WebUtil.MaxRequestDiagLength) + "...";
}
m_log.DebugFormat("[LOGHTTP] RESPONSE {0}: {1}", RequestNumber, output);
}
responseData = null;
}
}
@@ -970,6 +994,21 @@ namespace OpenSim.Framework.Servers.HttpServer
LogIncomingInDetail(request);
}
private void LogIncomingToStreamHandler(OSHttpRequest request, ISimpleStreamHandler requestHandler)
{
m_log.DebugFormat(
"[LOGHTTP] HTTP IN {0} :{1} stream handler {2} {3} {4} from {5}",
RequestNumber,
Port,
request.HttpMethod,
request.Url.PathAndQuery,
requestHandler.Name,
request.RemoteIPEndPoint);
if (DebugLevel >= 5)
LogIncomingInDetail(request);
}
private void LogIncomingToContentTypeHandler(OSHttpRequest request)
{
m_log.DebugFormat(