2 files changed, 23 insertions, 4 deletions

diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
index 1071692..55826f6 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common/OpenSim.Servers/BaseHttpServer.cs
@@ -88,6 +88,17 @@ namespace OpenSim.Servers
             return false;

         }

 

+        public bool RemoveRestHandler(string method, string path)

+        {

+            string methodKey = String.Format("{0}: {1}", method, path);

+            if (this.m_restHandlers.ContainsKey(methodKey))

+            {

+                this.m_restHandlers.Remove(methodKey);

+                return true;

+            }

+            return false;

+        }

+

         public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)

         {

             if (!this.m_rpcHandlers.ContainsKey(method))

@@ -213,7 +224,7 @@ namespace OpenSim.Servers
                 //Console.WriteLine(requestBody);

 

                 string responseString = "";

-                //Console.WriteLine("new request " + request.ContentType);

+                Console.WriteLine("new request " + request.ContentType +" at "+ request.RawUrl);

                 switch (request.ContentType)

                 {

                     case "text/xml":

@@ -232,6 +243,13 @@ namespace OpenSim.Servers
                         response.AddHeader("Content-type", "application/xml");

                         break;

 

+                    case "application/octet-stream":

+                        // probably LLSD we hope, otherwise it should be ignored by the parser

+                        // responseString = ParseLLSDXML(requestBody);

+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);

+                        response.AddHeader("Content-type", "application/xml");

+                        break;

+

                     case "application/x-www-form-urlencoded":

                         // a form data POST so send to the REST parser

                         responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);

diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/Common/OpenSim.Servers/CheckSumServer.cs
index 14ac11b..a359205 100644
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ b/Common/OpenSim.Servers/CheckSumServer.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Console;
 

 namespace OpenSim.Servers

 {

-    public class CheckSumServer : UDPServerBase

+/*    public class CheckSumServer : UDPServerBase

     {

         //protected ConsoleBase m_log;

 

@@ -79,7 +79,7 @@ namespace OpenSim.Servers
                 SecuredTemplateChecksumRequestPacket checkrequest = new SecuredTemplateChecksumRequestPacket();

                 checkrequest.TokenBlock.Token = checksum.TokenBlock.Token;

                 this.SendPacket(checkrequest, epSender);

-                */

+                

             }

             else if (packet.Type == PacketType.TemplateChecksumReply)

             {

@@ -136,5 +136,6 @@ namespace OpenSim.Servers
         {

             this.Server.SendTo(buffer, size, flags, endp);

         }

-    }

+ * 

+    }*/

 }
\ No newline at end of file