From 5c32b33a66fbdf371d53d85ee54ee8e837481570 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Wed, 4 Jul 2007 16:28:59 +0000
Subject: * re-fixed the utf-16 bug in xmlRpcResponse serialization * added
 LLSDStreamHandler.cs to Caps (Haven't enabled it yet, though) * removed last
 traces of old rest handling

---
 OpenSim/Region/Capabilities/LLSDStreamHandler.cs | 40 ++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 OpenSim/Region/Capabilities/LLSDStreamHandler.cs

(limited to 'OpenSim/Region/Capabilities/LLSDStreamHandler.cs')

diff --git a/OpenSim/Region/Capabilities/LLSDStreamHandler.cs b/OpenSim/Region/Capabilities/LLSDStreamHandler.cs
new file mode 100644
index 0000000..ff63353
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDStreamHandler.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Servers;
+using System.IO;
+using System.Collections;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
+        where TRequest : new()
+    {
+        private LLSDMethod<TRequest, TResponse> m_method;
+
+        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
+            : base(httpMethod, path)
+        {
+            m_method = method;
+        }
+        
+        public override byte[] Handle(string path, Stream request)
+        {
+            Encoding encoding = Encoding.UTF8;
+            StreamReader streamReader = new StreamReader(request, encoding);
+
+            string requestBody = streamReader.ReadToEnd();
+            streamReader.Close();
+
+            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(encoding.GetBytes(requestBody));
+            TRequest llsdRequest = new TRequest();
+            LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
+
+            TResponse response = m_method(llsdRequest);
+
+            return encoding.GetBytes( LLSDHelpers.SerialiseLLSDReply(response) );
+
+        }
+    }
+}
-- 
cgit v1.1


From 9f5f65c8477e3d05f384bafbb1bdf6dcb3f577c8 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 9 Jul 2007 23:32:29 +0000
Subject: * LLSDStreamhandler now works.

---
 OpenSim/Region/Capabilities/LLSDStreamHandler.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Capabilities/LLSDStreamHandler.cs')

diff --git a/OpenSim/Region/Capabilities/LLSDStreamHandler.cs b/OpenSim/Region/Capabilities/LLSDStreamHandler.cs
index ff63353..7d99b6e 100644
--- a/OpenSim/Region/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Region/Capabilities/LLSDStreamHandler.cs
@@ -14,25 +14,27 @@ namespace OpenSim.Region.Capabilities
         private LLSDMethod<TRequest, TResponse> m_method;
 
         public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : base(httpMethod, path)
+            : base(httpMethod, path )
         {
             m_method = method;
         }
         
         public override byte[] Handle(string path, Stream request)
         {
-            Encoding encoding = Encoding.UTF8;
-            StreamReader streamReader = new StreamReader(request, encoding);
+            //Encoding encoding = Encoding.UTF8;
+            //StreamReader streamReader = new StreamReader(request, false);
 
-            string requestBody = streamReader.ReadToEnd();
-            streamReader.Close();
+            //string requestBody = streamReader.ReadToEnd();
+            //streamReader.Close();
 
-            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(encoding.GetBytes(requestBody));
+            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize( request );
             TRequest llsdRequest = new TRequest();
             LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
 
             TResponse response = m_method(llsdRequest);
 
+            Encoding encoding = new UTF8Encoding(false);
+            
             return encoding.GetBytes( LLSDHelpers.SerialiseLLSDReply(response) );
 
         }
-- 
cgit v1.1