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

try to use HttpCompletionOption.ResponseHeadersRead again

Browse Source
This commit is contained in:
UbitUmarov
2026-03-11 18:52:49 +00:00
parent d3f314b292
commit f785a45418
5 changed files with 316 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Framework/RestClient.cs
View File

@@ -259,6 +259,7 @@ namespace OpenSim.Framework
HttpResponseMessage responseMessage = null;
HttpRequestMessage request = null;
HttpClient client = null;
bool bodyTimedOut = false;
try
{
client = WebUtil.GetNewGlobalHttpClient(DefaultTimeout);
@@ -286,15 +287,24 @@ namespace OpenSim.Framework
responseMessage = client.Send(request, HttpCompletionOption.ResponseHeadersRead);
responseMessage.EnsureSuccessStatusCode();
using CancellationTokenSource cts = new(30000);
using Stream respStream = responseMessage.Content.ReadAsStream(cts.Token);
int length = respStream.Read(_readbuf, 0, BufferSize);
while (length > 0)
using Stream respStream = responseMessage.Content.ReadAsStream();
using(CancellationTokenSource cts = new(WebUtil.EstimatedReceiveTimeout(responseMessage.Content.Headers, true)))
{
_resource.Write(_readbuf, 0, length);
length = respStream.Read(_readbuf, 0, BufferSize);
_ = cts.Token.Register(() =>
{
bodyTimedOut = true;
respStream?.Close();
});
int length = respStream.Read(_readbuf, 0, BufferSize);
while (length > 0)
{
_resource.Write(_readbuf, 0, length);
length = respStream.Read(_readbuf, 0, BufferSize);
}
}
}
catch (HttpRequestException e)
{
if(uri is not null)
@@ -335,6 +345,9 @@ namespace OpenSim.Framework
_resource.Seek(0, SeekOrigin.Begin);
}
if (bodyTimedOut)
m_log.Error($"[REST CLIENT] Data receive timeout from: {uri}");
if (WebUtil.DebugLevel >= 5)
WebUtil.LogOutgoingDetail("[REST CLIENT]", _resource);
@@ -372,7 +385,7 @@ namespace OpenSim.Framework
request.Content.Headers.TryAddWithoutValidation("Content-Type", "application/xml");
request.Content.Headers.TryAddWithoutValidation("Content-Length", src.Length.ToString());
responseMessage = client.Send(request, HttpCompletionOption.ResponseContentRead);
responseMessage = client.Send(request, HttpCompletionOption.ResponseHeadersRead);
responseMessage.EnsureSuccessStatusCode();
}
catch (HttpRequestException e)