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

(TEST) add a default root uri GET handler. this may be usefull for some cases.

master
UbitUmarov 2020-05-11 23:07:29 +01:00
parent 4bf4c76a64
commit c40b297fc7
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,8 @@ namespace OpenSim.Framework.Servers.HttpServer
protected ConcurrentDictionary<string, ISimpleStreamHandler> m_simpleStreamVarPath = new ConcurrentDictionary<string, ISimpleStreamHandler>(); protected ConcurrentDictionary<string, ISimpleStreamHandler> m_simpleStreamVarPath = new ConcurrentDictionary<string, ISimpleStreamHandler>();
protected ConcurrentDictionary<string, SimpleStreamMethod> m_indexPHPmethods = new ConcurrentDictionary<string, SimpleStreamMethod>(); protected ConcurrentDictionary<string, SimpleStreamMethod> m_indexPHPmethods = new ConcurrentDictionary<string, SimpleStreamMethod>();
protected IRequestHandler m_RootDefaultGET = null; // default method for root path. does override rpc xml and json, and old llsd login
protected uint m_port; protected uint m_port;
protected bool m_ssl; protected bool m_ssl;
private X509Certificate2 m_cert; private X509Certificate2 m_cert;
@ -328,6 +330,15 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
string httpMethod = handler.HttpMethod; string httpMethod = handler.HttpMethod;
string path = handler.Path; string path = handler.Path;
if(path == "/")
{
if(httpMethod == "GET" && (handler is IStreamedRequestHandler || handler is ISimpleStreamHandler))
m_RootDefaultGET = handler;
return;
}
string handlerKey = GetHandlerKey(httpMethod, path); string handlerKey = GetHandlerKey(httpMethod, path);
// m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey); // m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey);
@ -620,6 +631,28 @@ namespace OpenSim.Framework.Servers.HttpServer
if (path == "/") if (path == "/")
{ {
response.StatusCode = (int)HttpStatusCode.NotFound; // default response.StatusCode = (int)HttpStatusCode.NotFound; // default
if (m_RootDefaultGET != null && request.HttpMethod == "GET")
{
if(m_RootDefaultGET is IStreamedRequestHandler)
{
IStreamedRequestHandler isrh = m_RootDefaultGET as IStreamedRequestHandler;
response.RawBuffer = isrh.Handle(path, request.InputStream, request, response);
response.StatusCode = (int)HttpStatusCode.OK;
}
else if (m_RootDefaultGET is ISimpleStreamHandler)
{
ISimpleStreamHandler issh = m_RootDefaultGET as ISimpleStreamHandler;
issh.Handle(request, response);
}
if (request.InputStream != null && request.InputStream.CanRead)
request.InputStream.Dispose();
requestEndTick = Environment.TickCount;
response.Send();
return;
}
switch (request.ContentType) switch (request.ContentType)
{ {
case "application/json-rpc": case "application/json-rpc":