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

add auxiliar httpresponse.Redirect(string url, [HttpStatusCode redirStatusCode = HttpStatusCode.Redirect])

Browse Source
This commit is contained in:
UbitUmarov
2021-12-20 11:07:26 +00:00
parent 112a86b9e0
commit 3f584dbf12
10 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
View File

@@ -102,13 +102,11 @@ namespace OpenSim.Server.Handlers.Asset
if (metadata != null)
{
XmlSerializer xs =
new XmlSerializer(typeof(AssetMetadata));
XmlSerializer xs = new XmlSerializer(typeof(AssetMetadata));
result = ServerUtils.SerializeResult(xs, metadata);
httpResponse.StatusCode = (int)HttpStatusCode.OK;
httpResponse.ContentType =
SLUtil.SLAssetTypeToContentType(metadata.Type);
httpResponse.ContentType = SLUtil.SLAssetTypeToContentType(metadata.Type);
}
else
{
@@ -138,8 +136,7 @@ namespace OpenSim.Server.Handlers.Asset
result = ServerUtils.SerializeResult(xs, asset);
httpResponse.StatusCode = (int)HttpStatusCode.OK;
httpResponse.ContentType =
SLUtil.SLAssetTypeToContentType(asset.Type);
httpResponse.ContentType = SLUtil.SLAssetTypeToContentType(asset.Type);
}
else
{
@@ -158,12 +155,11 @@ namespace OpenSim.Server.Handlers.Asset
if (httpResponse.StatusCode == (int)HttpStatusCode.NotFound && !string.IsNullOrEmpty(m_RedirectURL) && !string.IsNullOrEmpty(id))
{
httpResponse.StatusCode = (int)HttpStatusCode.Redirect;
string rurl = m_RedirectURL;
if (!path.StartsWith("/"))
rurl += "/";
rurl += path;
httpResponse.AddHeader("Location", rurl);
httpResponse.Redirect(rurl);
m_log.DebugFormat("[ASSET GET HANDLER]: Asset not found, redirecting to {0} ({1})", rurl, httpResponse.StatusCode);
}
return result;