From f955482dfdf0ae58313f72f868c2d71dcfdea48c Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 24 Apr 2020 00:40:52 +0100 Subject: [PATCH] move ServerReleaseNotes module to simpleStreamHandler --- .../Linden/Caps/AgentPreferencesModule.cs | 2 +- .../Linden/Caps/ServerReleaseNotesModule.cs | 22 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs index 4ece8a2e77..867daceb98 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs @@ -95,7 +95,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps public void RegisterCaps(UUID agent, Caps caps) { - string capPath = "/" + UUID.Random().ToString(); + string capPath = "/" + UUID.Random().ToString() + "/"; caps.RegisterSimpleHandler("AgentPreferences", new SimpleStreamHandler(capPath, delegate(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) { diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ServerReleaseNotesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ServerReleaseNotesModule.cs index 9fc428014d..ad248558c2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ServerReleaseNotesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ServerReleaseNotesModule.cs @@ -112,22 +112,18 @@ namespace OpenSim.Region.ClientStack.LindenCaps public void RegisterCaps(UUID agentID, Caps caps) { - string capUrl = "/CAPS/" + UUID.Random() + "/"; - - IRequestHandler ServerReleaseNote = new RestHTTPHandler("GET", capUrl, - delegate (Hashtable request) - { - return ProcessServerReleaseNotes(request, agentID); - }); - caps.RegisterHandler("ServerReleaseNotes", ServerReleaseNote); + string capPath = "/" + UUID.Random() + "/"; + caps.RegisterSimpleHandler("ServerReleaseNotes", + new SimpleStreamHandler(capPath, delegate (IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) + { + ProcessServerReleaseNotes(httpResponse); + })); } - private Hashtable ProcessServerReleaseNotes(Hashtable request, UUID agentID) + private void ProcessServerReleaseNotes(IOSHttpResponse httpResponse) { - Hashtable responsedata = new Hashtable(); - responsedata["int_response_code"] = HttpStatusCode.Moved; - responsedata["str_redirect_location"] = m_ServerReleaseNotesURL; - return responsedata; + httpResponse.StatusCode = (int)HttpStatusCode.Moved; + httpResponse.AddHeader("Location:", m_ServerReleaseNotesURL); } } }