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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2020-04-09 13:41:41 +01:00
parent 523d6dd2da
commit c99014991b
13 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1703,7 +1703,7 @@ namespace OpenSim.Framework.Servers.HttpServer
response.AddHeader("Access-Control-Allow-Origin", "*");
response.AddHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, OPTIONS");
response.AddHeader("Access-Control-Allow-Headers", "Content-Type");
response.StatusCode = (int)OSHttpStatusCode.SuccessOk;
response.StatusCode = (int)HttpStatusCode.OK;
return null;
default:
@@ -1948,7 +1948,7 @@ namespace OpenSim.Framework.Servers.HttpServer
response.StatusCode = responsecode;
if (responsecode == (int)OSHttpStatusCode.RedirectMovedPermanently)
if (responsecode == (int)HttpStatusCode.Moved)
{
response.AddHeader("Location:", (string)responsedata["str_redirect_location"]);
response.StatusCode = responsecode;
@@ -2010,7 +2010,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public byte[] SendHTML500(OSHttpResponse response)
{
// I know this statuscode is dumb, but the client doesn't respond to 404s and 500s
response.StatusCode = (int)OSHttpStatusCode.SuccessOk;
response.StatusCode = (int)HttpStatusCode.OK;
response.AddHeader("Content-type", "text/html");
string responseString = GetHTTP500();

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

@@ -28,6 +28,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Net;
using System.Reflection;
using System.Text;
using OSHttpServer;
@@ -132,7 +133,7 @@ namespace OpenSim.Framework.Servers.HttpServer
response.StatusCode = responsecode;
if (responsecode == (int)OSHttpStatusCode.RedirectMovedPermanently)
if (responsecode == (int)HttpStatusCode.Moved)
{
response.AddHeader("Location:", (string)responsedata["str_redirect_location"]);
response.KeepAlive = false;

8
OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
View File

@@ -242,13 +242,13 @@ namespace OpenSim.Framework.Servers.HttpServer
if (string.IsNullOrEmpty(_request.Headers["upgrade"]))
{
FailUpgrade(OSHttpStatusCode.ClientErrorBadRequest, "no upgrade request submitted");
FailUpgrade(HttpStatusCode.BadRequest, "no upgrade request submitted");
}
string connectionheader = _request.Headers["upgrade"];
if (connectionheader.ToLower() != "websocket")
{
FailUpgrade(OSHttpStatusCode.ClientErrorBadRequest, "no connection upgrade request submitted");
FailUpgrade(HttpStatusCode.BadRequest, "no connection upgrade request submitted");
}
// If the object consumer provided a method to validate the origin, we should call it and give the client a success or fail.
@@ -266,7 +266,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
else
{
FailUpgrade(OSHttpStatusCode.ClientErrorForbidden, "Origin Validation Failed");
FailUpgrade(HttpStatusCode.Forbidden, "Origin Validation Failed");
}
}
else
@@ -353,7 +353,7 @@ namespace OpenSim.Framework.Servers.HttpServer
/// </summary>
/// <param name="pCode">HTTP Status reflecting the reason why</param>
/// <param name="pMessage">Textual reason for the upgrade fail</param>
private void FailUpgrade(OSHttpStatusCode pCode, string pMessage )
private void FailUpgrade(HttpStatusCode pCode, string pMessage )
{
string handshakeResponse = string.Format(HandshakeDeclineText, (int)pCode, pMessage.Replace("\n", string.Empty).Replace("\r", string.Empty));
byte[] bhandshakeResponse = Encoding.UTF8.GetBytes(handshakeResponse);