aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorlbsa712007-07-08 07:53:48 +0000
committerlbsa712007-07-08 07:53:48 +0000
commitd6d7e2127cc87059f21ed6f5d3d393b367bbaff7 (patch)
tree9acd19842a397893344885dd8a94448bc421a8c3 /Common
parent* Maintainence: Applying Dan's ODE Patch to Trunk (diff)
downloadopensim-SC_OLD-d6d7e2127cc87059f21ed6f5d3d393b367bbaff7.zip
opensim-SC_OLD-d6d7e2127cc87059f21ed6f5d3d393b367bbaff7.tar.gz
opensim-SC_OLD-d6d7e2127cc87059f21ed6f5d3d393b367bbaff7.tar.bz2
opensim-SC_OLD-d6d7e2127cc87059f21ed6f5d3d393b367bbaff7.tar.xz
Who would have known that the only way of specifying utf-8 without preamble, is to not specify encoding at all. Or 'null' when sending an Encoder.
Diffstat (limited to 'Common')
-rw-r--r--Common/XmlRpcCS/SimpleHttpRequest.cs4
-rw-r--r--Common/XmlRpcCS/XmlRpcRequestDeserializer.cs1
-rw-r--r--Common/XmlRpcCS/XmlRpcSerializer.cs5
3 files changed, 5 insertions, 5 deletions
diff --git a/Common/XmlRpcCS/SimpleHttpRequest.cs b/Common/XmlRpcCS/SimpleHttpRequest.cs
index aa260f4..b331ce0 100644
--- a/Common/XmlRpcCS/SimpleHttpRequest.cs
+++ b/Common/XmlRpcCS/SimpleHttpRequest.cs
@@ -57,8 +57,8 @@ namespace Nwc.XmlRpc
57 { 57 {
58 _client = client; 58 _client = client;
59 59
60 _output = new StreamWriter(client.GetStream(), Encoding.UTF8 ); 60 _output = new StreamWriter(client.GetStream() );
61 _input = new StreamReader(client.GetStream(), Encoding.UTF8 ); 61 _input = new StreamReader(client.GetStream() );
62 62
63 GetRequestMethod(); 63 GetRequestMethod();
64 GetRequestHeaders(); 64 GetRequestHeaders();
diff --git a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs b/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
index c3d3e16..126a172 100644
--- a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
+++ b/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
@@ -56,6 +56,7 @@ namespace Nwc.XmlRpc
56 override public Object Deserialize(TextReader xmlData) 56 override public Object Deserialize(TextReader xmlData)
57 { 57 {
58 XmlTextReader reader = new XmlTextReader(xmlData); 58 XmlTextReader reader = new XmlTextReader(xmlData);
59
59 XmlRpcRequest request = new XmlRpcRequest(); 60 XmlRpcRequest request = new XmlRpcRequest();
60 bool done = false; 61 bool done = false;
61 62
diff --git a/Common/XmlRpcCS/XmlRpcSerializer.cs b/Common/XmlRpcCS/XmlRpcSerializer.cs
index b682f69..b3b9af3 100644
--- a/Common/XmlRpcCS/XmlRpcSerializer.cs
+++ b/Common/XmlRpcCS/XmlRpcSerializer.cs
@@ -56,16 +56,15 @@ namespace Nwc.XmlRpc
56 { 56 {
57 using (MemoryStream memStream = new MemoryStream(4096)) 57 using (MemoryStream memStream = new MemoryStream(4096))
58 { 58 {
59 XmlTextWriter xml = new XmlTextWriter(memStream, Encoding.UTF8); 59 XmlTextWriter xml = new XmlTextWriter( memStream, null );
60 xml.Formatting = Formatting.Indented; 60 xml.Formatting = Formatting.Indented;
61 xml.Indentation = 4; 61 xml.Indentation = 4;
62 Serialize(xml, obj); 62 Serialize(xml, obj);
63 xml.Flush(); 63 xml.Flush();
64 64
65 byte[] resultBytes = memStream.ToArray(); 65 byte[] resultBytes = memStream.ToArray();
66 66
67 UTF8Encoding encoder = new UTF8Encoding(); 67 UTF8Encoding encoder = new UTF8Encoding();
68
69 String returns = encoder.GetString( resultBytes, 0, resultBytes.Length ); 68 String returns = encoder.GetString( resultBytes, 0, resultBytes.Length );
70 xml.Close(); 69 xml.Close();
71 return returns; 70 return returns;