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

some more cosmetics on http server

Browse Source
This commit is contained in:
UbitUmarov
2022-11-10 01:11:17 +00:00
parent 7ef28ede29
commit 70e50a4769
3 changed files with 212 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
View File

@@ -73,14 +73,14 @@ namespace OpenSim.Framework.Servers.HttpServer
OSHttpResponse response = new OSHttpResponse(new HttpResponse(Request));
if (responsedata == null)
if (responsedata is null)
{
SendNoContentError(response);
return;
}
int responsecode = 200;
string responseString = String.Empty;
string responseString = null;
string contentType;
byte[] buffer = null;
int rangeStart = 0;
@@ -105,10 +105,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
else
responseString = (string)responsedata["str_response_string"];
contentType = (string)responsedata["content_type"];
if (responseString == null)
responseString = String.Empty;
}
catch
{
@@ -158,7 +155,9 @@ namespace OpenSim.Framework.Servers.HttpServer
if(buffer == null)
{
if (contentType != null && (!(contentType.Contains("image")
if(string.IsNullOrEmpty(responseString))
buffer = Array.Empty<byte>();
else if (contentType != null && (!(contentType.Contains("image")
|| contentType.Contains("x-shockwave-flash")
|| contentType.Contains("application/x-oar")
|| contentType.Contains("application/vnd.ll.mesh"))))