From 7c0b3387dd393780f5b120a02974aeca2354e6be Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 11 May 2020 23:28:59 +0100 Subject: [PATCH] give up on simplehandler for root default get for now --- OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index efb7c169c9..4b953c553e 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -333,7 +333,7 @@ namespace OpenSim.Framework.Servers.HttpServer if(path == "/") { - if(httpMethod == "GET" && (handler is IStreamedRequestHandler || handler is ISimpleStreamHandler)) + if(httpMethod == "GET") m_RootDefaultGET = handler; return; @@ -356,8 +356,7 @@ namespace OpenSim.Framework.Servers.HttpServer 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); else 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.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();