* Removed AssetHttpServer, using BaseHttpServer instead

* Removed legacy REST handling
* Created two custom IStreamHandlers for asset up/download
* Removed quite a lot of double and triple encodings, trying to work towards binary only and direct write into storage.
* Introduced BaseStreamHandler with GetParam() and some other goodies

1 files changed, 10 insertions, 19 deletions

diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 2e76cee..a990ff7 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -127,25 +127,16 @@ namespace OpenSim.Grid.GridServer
             httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);

             httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);

 

-            httpServer.AddRestHandler("GET", "/sims/", m_gridManager.RestGetSimMethod);

-            httpServer.AddRestHandler("POST", "/sims/", m_gridManager.RestSetSimMethod);

-            httpServer.AddRestHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod);

-            httpServer.AddRestHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod);

-

-

-            // lbsa71 : This code snippet taken from old http server.

-            // I have no idea what this was supposed to do - looks like an infinite recursion to me.

-            //        case "regions":

-            //// DIRTY HACK ALERT

-            //Console.Notice("/regions/ accessed");

-            //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1]));

-            //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod);

-            //break;

-

-            // lbsa71 : I guess these were never used?

-            //Listener.Prefixes.Add("http://+:8001/gods/");

-            //Listener.Prefixes.Add("http://+:8001/highestuuid/");

-            //Listener.Prefixes.Add("http://+:8001/uuidblocks/");

+            httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod ));

+            httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", m_gridManager.RestSetSimMethod ));

+

+            httpServer.AddStreamHandler( new RestStreamHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod  ));

+            httpServer.AddStreamHandler( new RestStreamHandler("POST","/regions/", m_gridManager.RestSetRegionMethod  ));

+

+            //httpServer.AddRestHandler("GET", "/sims/", m_gridManager.RestGetSimMethod);

+            //httpServer.AddRestHandler("POST", "/sims/", m_gridManager.RestSetSimMethod);

+            //httpServer.AddRestHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod);

+            //httpServer.AddRestHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod);

 

             httpServer.Start();