diff options
author | Freaky Tech | 2015-03-02 20:42:57 +0100 |
---|---|---|
committer | BlueWall | 2015-03-03 15:35:09 -0500 |
commit | f68a1a22182cf62aedf34ff72d702fe7218d9162 (patch) | |
tree | e8c8a16c850062c64da4877d6d8b0d97824f1e43 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
parent | corrected llResetScript according to description within LSL wiki (diff) | |
download | opensim-SC_OLD-f68a1a22182cf62aedf34ff72d702fe7218d9162.zip opensim-SC_OLD-f68a1a22182cf62aedf34ff72d702fe7218d9162.tar.gz opensim-SC_OLD-f68a1a22182cf62aedf34ff72d702fe7218d9162.tar.bz2 opensim-SC_OLD-f68a1a22182cf62aedf34ff72d702fe7218d9162.tar.xz |
XML should not contain any BOM. Disabled BOM generation in BaseHttpServer
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 093855c..f252bd5 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -54,6 +54,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
54 | { | 54 | { |
55 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 55 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
56 | private HttpServerLogWriter httpserverlog = new HttpServerLogWriter(); | 56 | private HttpServerLogWriter httpserverlog = new HttpServerLogWriter(); |
57 | private static Encoding UTF8NoBOM = new System.Text.UTF8Encoding(false); | ||
57 | 58 | ||
58 | /// <summary> | 59 | /// <summary> |
59 | /// This is a pending websocket request before it got an sucessful upgrade response. | 60 | /// This is a pending websocket request before it got an sucessful upgrade response. |
@@ -1115,7 +1116,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1115 | 1116 | ||
1116 | response.ContentType = "text/xml"; | 1117 | response.ContentType = "text/xml"; |
1117 | using (MemoryStream outs = new MemoryStream()) | 1118 | using (MemoryStream outs = new MemoryStream()) |
1118 | using (XmlTextWriter writer = new XmlTextWriter(outs, Encoding.UTF8)) | 1119 | using (XmlTextWriter writer = new XmlTextWriter(outs, UTF8NoBOM)) |
1119 | { | 1120 | { |
1120 | writer.Formatting = Formatting.None; | 1121 | writer.Formatting = Formatting.None; |
1121 | XmlRpcResponseSerializer.Singleton.Serialize(writer, xmlRpcResponse); | 1122 | XmlRpcResponseSerializer.Singleton.Serialize(writer, xmlRpcResponse); |