OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move httpMethod OPTIONS handling to top, this needs to be chacked

master
UbitUmarov 2020-04-27 17:25:55 +01:00
parent fa844d7e6e
commit 89dee19060
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -607,6 +607,17 @@ namespace OpenSim.Framework.Servers.HttpServer
//m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); //m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl);
Culture.SetCurrentCulture(); Culture.SetCurrentCulture();
if(request.HttpMethod == "OPTIONS")
{
//need to check this
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)HttpStatusCode.OK;
return;
}
string path = request.UriPath; string path = request.UriPath;
if (path == "/") if (path == "/")
{ {
@ -1618,19 +1629,8 @@ namespace OpenSim.Framework.Servers.HttpServer
// "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}", // "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}",
// request.RawUrl, request.HttpMethod); // request.RawUrl, request.HttpMethod);
switch (request.HttpMethod)
{
case "OPTIONS":
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)HttpStatusCode.OK;
return null;
default:
return HandleContentVerbs(request, response); return HandleContentVerbs(request, response);
} }
}
private byte[] HandleContentVerbs(OSHttpRequest request, OSHttpResponse response) private byte[] HandleContentVerbs(OSHttpRequest request, OSHttpResponse response)
{ {