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

give up on simplehandler for root default get for now

master
UbitUmarov 2020-05-11 23:28:59 +01:00
parent c40b297fc7
commit 7c0b3387dd
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,7 @@ namespace OpenSim.Framework.Servers.HttpServer
if(path == "/") if(path == "/")
{ {
if(httpMethod == "GET" && (handler is IStreamedRequestHandler || handler is ISimpleStreamHandler)) if(httpMethod == "GET")
m_RootDefaultGET = handler; m_RootDefaultGET = handler;
return; return;
@ -356,8 +356,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public void AddSimpleStreamHandler(ISimpleStreamHandler handler, bool varPath = false) public void AddSimpleStreamHandler(ISimpleStreamHandler handler, bool varPath = false)
{ {
// m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey); if (varPath)
if(varPath)
m_simpleStreamVarPath.TryAdd(handler.Path, handler); m_simpleStreamVarPath.TryAdd(handler.Path, handler);
else else
m_simpleStreamHandlers.TryAdd(handler.Path, handler); m_simpleStreamHandlers.TryAdd(handler.Path, handler);
@ -640,11 +639,6 @@ namespace OpenSim.Framework.Servers.HttpServer
response.RawBuffer = isrh.Handle(path, request.InputStream, request, response); response.RawBuffer = isrh.Handle(path, request.InputStream, request, response);
response.StatusCode = (int)HttpStatusCode.OK; 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) if (request.InputStream != null && request.InputStream.CanRead)
request.InputStream.Dispose(); request.InputStream.Dispose();